2020-07-29 12:35:35 UTC

712 files changed, 5073 insertions, 4337 deletions

diff --git a/metadata/md5-cache/dev-ros/actionlib-1.13.1 b/metadata/md5-cache/dev-ros/actionlib-1.13.1
index a40ab4fa1fdf..5462ae675e2d 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.13.1
+++ b/metadata/md5-cache/dev-ros/actionlib-1.13.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.1.tar.gz -> actionlib-1.13.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18a981dde395241d0c8dce7461c2e54b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3436f6df566d112d4ac04e01cdc11119
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index f6daf4413c87..15957bd9aff9 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18a981dde395241d0c8dce7461c2e54b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3436f6df566d112d4ac04e01cdc11119
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 5b5a71927168..2be7734166bb 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-9999 b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
index 497ded152c1c..cf26012c6f1c 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e95dcda748d6de6497ba8e893c632696
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1 b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1
index ee7988872219..d33e86cfe7e1 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Tools for dealing with actionlib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.13.1.tar.gz -> actionlib-1.13.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22e6139385ff249dcba3ad65f75d43b3
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b64bfc7adca94d4d6b324787a92d90a1
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-9999 b/metadata/md5-cache/dev-ros/actionlib_tools-9999
index be9516568a5d..06239151aa80 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tools-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Tools for dealing with actionlib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22e6139385ff249dcba3ad65f75d43b3
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 2e026ff2f851..0d2bbbccf899 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
new file mode 100644
index 000000000000..21b1fa738565
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.2.0
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+DESCRIPTION=Actionlib tutorials
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
+IUSE=+python_single_target_python3_7 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=530f7ea28fba85a8e902134c7c69a216
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999 b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
index 693cd5cf39b6..e99983dac094 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Actionlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 92a990357606..dcc76ddb9997 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.17.0
+++ b/metadata/md5-cache/dev-ros/amcl-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-2.1
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d70f4c58c9e3ea836d466abcb6ae7c2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3f369cea4504e6d0d169c444a6640a1
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index c0796cf04bba..4fed01ebaa67 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_server[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/map_server[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/amcl https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=LGPL-2.1
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/rosbag dev-libs/boost:= dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5d70f4c58c9e3ea836d466abcb6ae7c2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3f369cea4504e6d0d169c444a6640a1
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.13 b/metadata/md5-cache/dev-ros/angles-1.9.13
index 58ff3768cd64..e6f45f5ee35d 100644
--- a/metadata/md5-cache/dev-ros/angles-1.9.13
+++ b/metadata/md5-cache/dev-ros/angles-1.9.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/angles/archive/1.9.13.tar.gz -> angles-1.9.13.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/angles-9999 b/metadata/md5-cache/dev-ros/angles-9999
index acabef15b7a2..5ae5a34db334 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ff71c32720451a93e498f46795a63bc4
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 71e8412171c7..38ddffc7947f 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-9999 b/metadata/md5-cache/dev-ros/audio_capture-9999
index 70425dad8b2c..8f1a86797ed9 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=64fdba36435eba08dd70a22f43ae4a2f
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 e494fdebeaf3..dcdf78905874 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 693cd885345c..51b71dab7173 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=de63960ca5ad5ac769adc5b8ef25acf7
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 fcd9b1538d97..1e9d55cb4a2e 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.6
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.6
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-9999 b/metadata/md5-cache/dev-ros/audio_play-9999
index dd69a2bfb02a..0c449819e41e 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3a51902d6969..0b1891235662 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,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] 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(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad73feee65ff960fd9b52b3fd6174863
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 7371addc2ae8..21bfb09027c2 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] 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(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/base_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/angles >=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad73feee65ff960fd9b52b3fd6174863
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 e42b9d1f2554..b7f88ce085f4 100644
--- a/metadata/md5-cache/dev-ros/bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/bond-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d3ac4dd2efee4b100138be71dbd3f73
diff --git a/metadata/md5-cache/dev-ros/bond-9999 b/metadata/md5-cache/dev-ros/bond-9999
index f017bed83e37..6afa8ad8ca93 100644
--- a/metadata/md5-cache/dev-ros/bond-9999
+++ b/metadata/md5-cache/dev-ros/bond-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c6c3563ea881..622ca4b70cc3 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c1231b8405941d634eee73b624944f1c
diff --git a/metadata/md5-cache/dev-ros/bondcpp-9999 b/metadata/md5-cache/dev-ros/bondcpp-9999
index 43262db7c795..b1029918df2f 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-9999
+++ b/metadata/md5-cache/dev-ros/bondcpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 67d13a30f76a..2a0db8323bdc 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.8.5
+++ b/metadata/md5-cache/dev-ros/bondpy-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smclib sys-apps/util-linux python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bond[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smclib sys-apps/util-linux python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ebc5750341717ecc397ad0be0b696db
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e7474a45b9c35d2267667350b8489004
diff --git a/metadata/md5-cache/dev-ros/bondpy-9999 b/metadata/md5-cache/dev-ros/bondpy-9999
index 5d763dc10a32..598519050518 100644
--- a/metadata/md5-cache/dev-ros/bondpy-9999
+++ b/metadata/md5-cache/dev-ros/bondpy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/bond[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smclib sys-apps/util-linux python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bond[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smclib sys-apps/util-linux python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/bond[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ebc5750341717ecc397ad0be0b696db
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 f31d1381e271..9d5152839138 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urdf_parser_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( sci-libs/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urdf_parser_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( sci-libs/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d11828932cba0afa922a406e79fe9aa
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72b3bf36f6b55d2ea082adb2f7750e89
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-9999 b/metadata/md5-cache/dev-ros/calibration_estimation-9999
index cae7efeb421b..cc184b6b6028 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urdf_parser_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( sci-libs/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/scipy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/urdf_parser_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/calibration_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) python_single_target_python3_7? ( sci-libs/scipy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/urdf_parser_py[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2d11828932cba0afa922a406e79fe9aa
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=72b3bf36f6b55d2ea082adb2f7750e89
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 69ef948f231f..e8e0b130a600 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b7f19cf72a5d99628726d97812d758f4
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-9999 b/metadata/md5-cache/dev-ros/calibration_launch-9999
index 4558f23f8fbc..248e76040eca 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5187b3564ec1..f18e336a18ff 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=dfdbf88ea58efa0567ef1b7e13961029
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-9999 b/metadata/md5-cache/dev-ros/calibration_msgs-9999
index fc2b629eec0c..3ea3c9ebf2f6 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-9999
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for storing calibration samples to be used in calibration procedures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/calibration_msgs https://github.com/ros-perception/calibration
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8445edb98ed4..d31426b68dbb 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/calibration_launch python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 783c0050206c..d0e1bf39a001 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/calibration_launch python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/calibration_launch python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 58dadb300865..157fd99cc45c 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4adff3ec694b3e3b60bef48a92f1b131
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cddf5cf1828fb5e1fe32b03ff21ff007
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-9999 b/metadata/md5-cache/dev-ros/camera_calibration-9999
index 6d7fcbc30292..2888a600cf2d 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Calibration of monocular or stereo cameras
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/image_geometry[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_srvs[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4adff3ec694b3e3b60bef48a92f1b131
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cddf5cf1828fb5e1fe32b03ff21ff007
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 93fba64054be..90b0d97e9b7e 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,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( dev-python/nose ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( dev-python/nose ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5080631be6ce389bde1d63e7b4255076
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e1feb08d0d84334cd4cb7d74a996e23
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
index 66d9da7ca932..7db814d72985 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( dev-python/nose ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( dev-python/nose ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-libs/boost:=[python,python_targets_python3_7(-)] ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5080631be6ce389bde1d63e7b4255076
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5e1feb08d0d84334cd4cb7d74a996e23
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 8f21d5c5b0bf..3ab89e57ad2d 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6738d4b6a04ac02762ea3cb8024d2d0e
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-9999 b/metadata/md5-cache/dev-ros/camera_info_manager-9999
index e8011519ec79..b0cf243d3ec5 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6738d4b6a04ac02762ea3cb8024d2d0e
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0 b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0
deleted file mode 100644
index 2a665d893265..000000000000
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4624062d4e5ec45de23f9b46a444b06
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1 b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
new file mode 100644
index 000000000000..f8079eb47045
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.17.0-r1
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
+IUSE=+python_single_target_python3_7 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4aba74e6e586813ce43e714830383858
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index 7e38cea200f8..5f0469056074 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/carrot_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/console_bridge:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d4624062d4e5ec45de23f9b46a444b06
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 c2b3cee4244b..d2e6dbb674bb 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.5.0
+++ b/metadata/md5-cache/dev-ros/class_loader-0.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/class_loader-9999 b/metadata/md5-cache/dev-ros/class_loader-9999
index 9079409ad2ca..6c81e7ed60e3 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4ee846e9b537..f1ba1704fd98 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16.3 dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=231b6389e7236afcdd3fdf6e8a4399cc
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index 343317277c9e..72f8abe4183f 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Recovery behavior that attempts reverting the costmaps to the static map
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/clear_costmap_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3a5d2363a4f2..b251b367c06c 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/cmake_modules/archive/0.5.0.tar.gz -> cmake_modules-0.5.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-9999 b/metadata/md5-cache/dev-ros/cmake_modules-9999
index 099edd1c55e4..034fe4120378 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5be3fb5129d6..e8fbcc8e5326 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index 3f66dd45da8b..96a0cb20367d 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0354664ec72c..4266bd96c980 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7198cdd3a39c66b897e1626f3bb18340
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index 266d966aa72a..4812bba71178 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-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 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7198cdd3a39c66b897e1626f3bb18340
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 5802be55514c..8b86b2917eb8 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/hardware_interface-0.15 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=df7e8a0862fa84f81e4346d497255bc3
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
index 0055c464033f..ed2baef6dcf9 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Combined Robot HW class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 fca353b66592..24c0801e56c6 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd9c5835d1d95e731f5c984b2836baf7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d80384d4bf8b0170f734a99ee9edb23
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 e7ccd96913c9..a2d26b4c0a79 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Combined Robot HW class tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/combined_robot_hw_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd9c5835d1d95e731f5c984b2836baf7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5d80384d4bf8b0170f734a99ee9edb23
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
index ab9be95a444b..4f641b84a529 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=213d842dd30eccf7968a50065dfbf4c4
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=521bf30aafef812aae87a005c04d0500
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 bd43ba7a4f73..ac82f0adc6c0 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=213d842dd30eccf7968a50065dfbf4c4
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=521bf30aafef812aae87a005c04d0500
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
index 6616c782c02c..ecf2325f41ab 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=550e19b2b5450bb2f8a17b57524ee74b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18865f53abe09f215a18065131bb10cb
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
index 3f155a6fb065..136d682e2c37 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport media-libs/opencv:= dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=550e19b2b5450bb2f8a17b57524ee74b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18865f53abe09f215a18065131bb10cb
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 16a62445cc87..c4854f7712be 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.5.2
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_msgs-9999 b/metadata/md5-cache/dev-ros/control_msgs-9999
index 0753b0476b99..29beda757c32 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a42b21dc56de..c1a448aba5ca 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc63c0d67f122c5a7a341a4cec8bf560
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index 6360ee791dea..ce1ac89f8853 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cc63c0d67f122c5a7a341a4cec8bf560
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.19.1 b/metadata/md5-cache/dev-ros/controller_interface-0.19.1
index 12215e019bac..3597be403bbe 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f233353f994d94812099ac2f7a9ac254
diff --git a/metadata/md5-cache/dev-ros/controller_interface-9999 b/metadata/md5-cache/dev-ros/controller_interface-9999
index 3e0dc3b13a16..faadffd2f015 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Interface base class for controllers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f233353f994d94812099ac2f7a9ac254
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.19.1 b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
index d2f7922a8d28..192409d66ebf 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.19.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=161f3999b55429aeed1ff99ce0676114
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=314c7143b7b53834fd9856c4c427d582
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index 04d0f221c864..4eb3b0b83109 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/controller_interface-0.15 >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_single_target_python3_7(-)?,ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=161f3999b55429aeed1ff99ce0676114
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=314c7143b7b53834fd9856c4c427d582
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 8b90db5f8eb0..38075874372c 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4eeaa151033c94f8c057e18cd187c82
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a82b1a5b97417f2b39f5cbd47692ea61
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999 b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
index cd1475ca4d11..79ad2596025f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=The controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_msgs https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4eeaa151033c94f8c057e18cd187c82
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 2411306cfa1f..da8d6bb65eae 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ecfd6a4472527ebf9ee1eb24b7658dd
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5da38ef6a09d930e6d462717f8355ff7
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index 58a8c15121ee..a78b90aae5a9 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for the controller manager
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/controller_manager_tests https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/controller_interface dev-ros/control_toolbox dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ecfd6a4472527ebf9ee1eb24b7658dd
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5da38ef6a09d930e6d462717f8355ff7
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 e7f9a46705ea..ef7699fda621 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.12.tar.gz -> convex_decomposition-0.1.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-9999 b/metadata/md5-cache/dev-ros/convex_decomposition-9999
index ced1cbe8e9d3..cfe9880b3ba4 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=app-arch/unzip python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0 b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0
deleted file mode 100644
index 9ccf204af8df..000000000000
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Creates a 2D costmap from sensor data
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7266b9bc440662589c5abaf8c8a165b
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1 b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
new file mode 100644
index 000000000000..ac99c1befd68
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.17.0-r1
@@ -0,0 +1,16 @@
+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(-)?] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+DESCRIPTION=Creates a 2D costmap from sensor data
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd2c1a079ad8ea570232765666f6ed75
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index 522f523ed653..80fca983147d 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/map_server dev-ros/rosbag dev-ros/rostest[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/costmap_2d https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/map_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/map_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=ros_messages_cxx || ( python_targets_python3_6 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/voxel_grid dev-ros/tf2_sensor_msgs dev-cpp/eigen:3 dev-libs/boost:=[threads] dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+REQUIRED_USE=ros_messages_cxx ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f7266b9bc440662589c5abaf8c8a165b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd2c1a079ad8ea570232765666f6ed75
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 1def793ff110..509e906515e1 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.7.2
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=574c0e74863867b299f9c1c2dfaa4eff
diff --git a/metadata/md5-cache/dev-ros/cpp_common-9999 b/metadata/md5-cache/dev-ros/cpp_common-9999
index 623278dbe4bd..04a453a1c8ee 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-9999
+++ b/metadata/md5-cache/dev-ros/cpp_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=574c0e74863867b299f9c1c2dfaa4eff
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
index 8b1b6c2d59e5..569cbd7f5c7b 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1730a3e7bebbcda19d1d28c7a8803656
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0598038cf3be7663b6ea284d3e198d75
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index 879a463f9ddb..ee2077433555 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] python_single_target_python3_7? ( dev-libs/boost:=[threads,python,python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1730a3e7bebbcda19d1d28c7a8803656
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0598038cf3be7663b6ea284d3e198d75
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 3d527fdffa35..225f689f309f 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9cec3f1a2bdea775d505e7abf1f6ab93
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-9999 b/metadata/md5-cache/dev-ros/depth_image_proc-9999
index 2309c5575949..1571641bfce1 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f252780793ac..c64efe9772b4 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.8.tar.gz -> depthimage_to_laserscan-1.0.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eea59247fa1b4375da733066bc07f6f5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9001c7b240b4ea3c87868e410f39e505
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index 10e2789d5dea..0cc6a593e3c0 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eea59247fa1b4375da733066bc07f6f5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9001c7b240b4ea3c87868e410f39e505
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.4 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.4
index 8ce81f9ecd49..1c1864a9cfec 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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/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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f80def58338eeee483d014ae690b0f87
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
index 3d0d0345c171..8d2c4d39dad5 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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/diagnostic_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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/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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f80def58338eeee483d014ae690b0f87
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 fde925d949cf..2e2e8a441392 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33954df520733b59961bcb8e117258f9
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d612db657c3aa3c52d88de15a6858813
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999 b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
index ad3fd34b48d7..36c2ebb9fe96 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_analysis https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=33954df520733b59961bcb8e117258f9
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d612db657c3aa3c52d88de15a6858813
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 7c7d63089775..78404354c355 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-admin/hddtemp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80410eb0af2047519b512477cae0e3df
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a9152bd9790c5898879c6a90aadf9177
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
index 0c6201beae97..7ce84afcd344 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_common_diagnostics https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] app-admin/hddtemp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_updater[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] app-admin/hddtemp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=80410eb0af2047519b512477cae0e3df
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a9152bd9790c5898879c6a90aadf9177
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 428de0ab87f9..a56a2de571a5 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=886f5ee4f61183592c17894438837433
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999 b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
index b90176dc5604..0e5d2917cf8c 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=886f5ee4f61183592c17894438837433
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 6ad13f0b0851..f610ae95fe3f 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c7fd9c7f253fb238a5537b3b05f29ff
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=555122dab9b77cb3c9adddb18cfca278
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-9999 b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
index a74f4db054e1..c9750544a45a 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tools for updating diagnostics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/diagnostic_updater https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c7fd9c7f253fb238a5537b3b05f29ff
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=555122dab9b77cb3c9adddb18cfca278
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 bcbdf41fe1d9..91ebeffe56d6 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/driver_base-9999 b/metadata/md5-cache/dev-ros/driver_base-9999
index 04e7392598a4..287de38d5ac9 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Framework for writing drivers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 943063d7389a..01d97620fa8d 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f7e1e64b14aecafc45af235480b20ca
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 e7d869f97b15..24570765c2ce 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dwa_local_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f7e1e64b14aecafc45af235480b20ca
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=affd31a6290d3ebb58c34263148d09d9
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
index 24280fe7b226..b3e86cab4599 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.7.0.tar.gz -> dynamic_reconfigure-1.7.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ee8c9f8584ed9b5de430273dfa89d3c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9825ee72c535c097bc80f4093a546b9c
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index 9905781ef187..5068ea773f70 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Provides a means to change node parameters at runtime
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4ee8c9f8584ed9b5de430273dfa89d3c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9825ee72c535c097bc80f4093a546b9c
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 40d15868c338..9b5c1050950f 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-libs/orocos_kdl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06d257b5cf3b920e3549d99f9dc375c7
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-9999 b/metadata/md5-cache/dev-ros/eigen_conversions-9999
index 26f0861d1192..53cc0b47dab8 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-9999
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-libs/orocos_kdl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 734b2e09224f..77fa593ccc18 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz -> eigen_stl_containers-0.1.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a03a84218c23..8ed1c15e787d 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-cpp/eigen:3 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0c7e82071911..330100161eb5 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.17.0
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/message_filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a019d2a4e48b416c113286a6f0853492
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/fake_localization-9999 b/metadata/md5-cache/dev-ros/fake_localization-9999
index 02031005c17c..9735edfeb8e0 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-9999
+++ b/metadata/md5-cache/dev-ros/fake_localization-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/fake_localization https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/message_filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a019d2a4e48b416c113286a6f0853492
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b2989dcd1a5b3100835667f8f2f38e9
diff --git a/metadata/md5-cache/dev-ros/filters-1.9.0 b/metadata/md5-cache/dev-ros/filters-1.9.0
index 74ccdbe030c6..f40669bf1a2a 100644
--- a/metadata/md5-cache/dev-ros/filters-1.9.0
+++ b/metadata/md5-cache/dev-ros/filters-1.9.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/filters/archive/1.9.0.tar.gz -> filters-1.9.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=542c9ceab517ac39da5d8caaf6adbf1b
diff --git a/metadata/md5-cache/dev-ros/filters-9999 b/metadata/md5-cache/dev-ros/filters-9999
index dbd56852afb8..f2068caf02ae 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=542c9ceab517ac39da5d8caaf6adbf1b
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 505a3759e607..303034d046db 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-9999 b/metadata/md5-cache/dev-ros/gazebo_dev-9999
index a0582a20329b..c0bd09f8621e 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-electronics/gazebo python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 355a1b30c66b..6c517edd83eb 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-9999 b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
index 428396cf78c5..1656b4b21ec1 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 1e499c037e9c..ec790c5f2b70 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/driver_base[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] 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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/driver_base[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e68688229f8f4aaea9b1cae25f01021
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f0ccc4f7cb1ff2271f58a164612487dc
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 6db38d6ad7aa..6919b9e8b913 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/driver_base[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] 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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Robot-independent Gazebo plugins
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_plugins https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/driver_base[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/driver_base[python_single_target_python3_7(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4e68688229f8f4aaea9b1cae25f01021
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 8c36acb4c753..36043c870d3d 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18b1dd018116e4defe719a9ad34a6696
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63f20d33cc4d6c3408bfd2bf368ea5d0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index 745f341886c8..7a4ad47ff574 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18b1dd018116e4defe719a9ad34a6696
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 5f79ba4e17a5..0d7633e69e40 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index 76852cde555d..f0786cac788e 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 df937dac4607..8922e1d4c66f 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.6.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.6.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/gencpp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.5
 SRC_URI=https://github.com/ros/gencpp/archive/0.6.5.tar.gz -> gencpp-0.6.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15d2011a4c3e4beb2374761af719e456
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0108f2a945b715425989f99b376c4ff1
diff --git a/metadata/md5-cache/dev-ros/gencpp-9999 b/metadata/md5-cache/dev-ros/gencpp-9999
index 8012c5a28bf3..3ba7b96842c8 100644
--- a/metadata/md5-cache/dev-ros/gencpp-9999
+++ b/metadata/md5-cache/dev-ros/gencpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/gencpp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15d2011a4c3e4beb2374761af719e456
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0108f2a945b715425989f99b376c4ff1
diff --git a/metadata/md5-cache/dev-ros/geneus-3.0.0 b/metadata/md5-cache/dev-ros/geneus-3.0.0
index 41c9543759be..12c35192ce20 100644
--- a/metadata/md5-cache/dev-ros/geneus-3.0.0
+++ b/metadata/md5-cache/dev-ros/geneus-3.0.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geneus https://github.com/jsk-ros-pkg/geneus
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cddc6d276d7673c38a9208b918849c41
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd1e60d017e672894e20f06cbb867273
diff --git a/metadata/md5-cache/dev-ros/geneus-9999 b/metadata/md5-cache/dev-ros/geneus-9999
index a3fd637433ca..5087fd123d46 100644
--- a/metadata/md5-cache/dev-ros/geneus-9999
+++ b/metadata/md5-cache/dev-ros/geneus-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geneus https://github.com/jsk-ros-pkg/geneus
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cddc6d276d7673c38a9208b918849c41
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=dd1e60d017e672894e20f06cbb867273
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.18 b/metadata/md5-cache/dev-ros/genlisp-0.4.18
index da9aa5352103..d58c4416184a 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.18
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.18
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.4.18
 SRC_URI=https://github.com/ros/genlisp/archive/0.4.18.tar.gz -> genlisp-0.4.18.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60f6be6b062b45263341ffb5db801c5a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d47add50bf7b0d67d6e8cf4c8726141
diff --git a/metadata/md5-cache/dev-ros/genlisp-9999 b/metadata/md5-cache/dev-ros/genlisp-9999
index b4bea9a93311..98ec2d6addb2 100644
--- a/metadata/md5-cache/dev-ros/genlisp-9999
+++ b/metadata/md5-cache/dev-ros/genlisp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genlisp https://github.com/ros/genlisp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60f6be6b062b45263341ffb5db801c5a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 fd799ee4ec6b..e826a9c10609 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.16
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.16
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python library for generating ROS message and service data structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/genmsg/archive/0.5.16.tar.gz -> genmsg-0.5.16.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dd0b6145769f87db002033963968ed8
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1b256532efa7c4d61b391eadf6fe72fe
diff --git a/metadata/md5-cache/dev-ros/genmsg-9999 b/metadata/md5-cache/dev-ros/genmsg-9999
index 8082044243b5..d8302b8781bc 100644
--- a/metadata/md5-cache/dev-ros/genmsg-9999
+++ b/metadata/md5-cache/dev-ros/genmsg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python library for generating ROS message and service data structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/genmsg https://github.com/ros/genmsg
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dd0b6145769f87db002033963968ed8
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 95363f6b5979..a9279ceac048 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-2.0.1
+++ b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/gennodejs
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=Apache-2.0
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1
 SRC_URI=https://github.com/RethinkRobotics-opensource/gennodejs/archive/2.0.1.tar.gz -> gennodejs-2.0.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c94e2fd9737c6554ea3177923b9dee7a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b278fb21bb953904c32d236d46e13ba8
diff --git a/metadata/md5-cache/dev-ros/gennodejs-9999 b/metadata/md5-cache/dev-ros/gennodejs-9999
index 0c1b65fad506..2535fe63ca97 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/gennodejs
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c94e2fd9737c6554ea3177923b9dee7a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b278fb21bb953904c32d236d46e13ba8
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.11 b/metadata/md5-cache/dev-ros/genpy-0.6.11
index 59d4c0228999..cd592dc360de 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.11
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/genpy
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/0.6.11
 SRC_URI=https://github.com/ros/genpy/archive/0.6.11.tar.gz -> genpy-0.6.11.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e358b5f96b276e583a465dbf30a1124e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0aca304128df822e1e4a903eb88f5d0
diff --git a/metadata/md5-cache/dev-ros/genpy-9999 b/metadata/md5-cache/dev-ros/genpy-9999
index c16c20d6c076..0a9cede03b9b 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python ROS message and service generators
 EAPI=7
 HOMEPAGE=http://wiki.ros.org/genpy
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e358b5f96b276e583a465dbf30a1124e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d0aca304128df822e1e4a903eb88f5d0
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.5 b/metadata/md5-cache/dev-ros/geodesy-0.5.5
index b70bda0c0cb0..923a852f3d81 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.5.5
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) 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(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63befbfeb4d4aab5125d46649b28d42f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d91cf93ee53349da15a1766a524ebaa
diff --git a/metadata/md5-cache/dev-ros/geodesy-9999 b/metadata/md5-cache/dev-ros/geodesy-9999
index 1607d1c9b990..94e920d58a77 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) 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(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyproj[python_targets_python3_7(-)] ) dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=63befbfeb4d4aab5125d46649b28d42f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d91cf93ee53349da15a1766a524ebaa
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 6d6686cbf401..58552e2d30d3 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-9999 b/metadata/md5-cache/dev-ros/geographic_msgs-9999
index c0cb9f05c8f6..0cc9d8c38376 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
index 1a4d61ee8f4e..7e8d3bb00522 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.0.tar.gz -> geometric_shapes-0.7.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36a3d00af8f6496ae1bde28944d38314
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index 6a8668d5cb16..49bda4e546d6 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=36a3d00af8f6496ae1bde28944d38314
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 61955a869312..8deda31abdb7 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=72701395a6441ca24710bdb9deb98c69
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-9999 b/metadata/md5-cache/dev-ros/geometry_msgs-9999
index cfb70e1eb2c7..d472fbe6a904 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometry_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a22af3d7b8b9..f81a03c0f341 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.17.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6efe797aa9b0308c0655139e4afdf74f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/global_planner-9999 b/metadata/md5-cache/dev-ros/global_planner-9999
index 3ab39af462f2..ca7556c57f66 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Path planner library and node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/global_planner https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6efe797aa9b0308c0655139e4afdf74f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a97f0811f15fe2f6fae0fc3886c5db88
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.4.1 b/metadata/md5-cache/dev-ros/gmapping-1.4.1
index d7e193e4cee0..7a07f768f5c0 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.4.1
+++ b/metadata/md5-cache/dev-ros/gmapping-1.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.1.tar.gz -> slam_gmapping-1.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1af76dc8c46b3a9cccc53626491d0e7
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 8bd864dfd957..520429935236 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b1af76dc8c46b3a9cccc53626491d0e7
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 7a887dfdf6e5..03f0b1876fe9 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index 6fc913b0845f..ad032e188ff4 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest dev-ros/rostest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Hardware Interface base class
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/hardware_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=27da90fb15967ce2b1e5611caf42f3c4
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
index c715c80e73d1..291ff3c81807 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d830e16d8397255ba1c20e283425b216
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 538494679346..e82797cfad81 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
index 8e1ee93a6619..fec1e4f43fcb 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d69a6460307608173fc1f79733d2c4f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-9999 b/metadata/md5-cache/dev-ros/hector_geotiff-9999
index 0b970e99b976..89f2ab4de896 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8d69a6460307608173fc1f79733d2c4f
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 6c2bc2b5c235..71e68ba73017 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
index ae391ca937b2..c1adda406e04 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
index 247e4ddca5e9..084a4dd2f609 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
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 32ba6b70a829..ac8fbc6d68f4 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,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3c24f023034a..1ba767c01ea9 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-9999 b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
index e8eb6dc816ae..4a76360a0716 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 594232a45570..75ca21e2cd53 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-9999 b/metadata/md5-cache/dev-ros/hector_map_server-9999
index 4847674c6994..febefd41ff40 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 60ff6abc10e6..d2767ec496d3 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-9999 b/metadata/md5-cache/dev-ros/hector_map_tools-9999
index 4ac077dccdb4..8c5003b88dae 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 89f6d7b1aa9e..a81852810132 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) 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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-9999 b/metadata/md5-cache/dev-ros/hector_mapping-9999
index a7560242406a..66ac7a90cb58 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) 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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 68cfaabfc626..c0eab644171d 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999 b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
index b2e8c667ec9d..5dddcf847041 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
index 26a7e61b9263..5b0e1217849c 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fc6876bc9317bd927b127f32204a198
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index 2d7482d6c4b7..f1ae45a13eec 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=8fc6876bc9317bd927b127f32204a198
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 27211a4286b2..6bad368b0aa0 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e658ee7e44484c2c9a89267812b2472
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
index 6a4357cb097f..388ab4ec8acb 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c682577b6799..c60e68d46100 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a40d3b7b6eeef71184fd7c6fe8f399dc
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 fb51485da8b1..d76c1f5cffbc 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fabbfad8e1eab30ede6e0257ae2ed725
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
index bff3fe8de64a..3c8a002baf94 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=af4bd6a8cf4132a83050d6be43cc1116
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-9999 b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
index 875942523c7c..887df4620e76 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e28b37890b45..2790438f10cf 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999 b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
index 21bf3eae84ff..7ea15337c852 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4759c6a0e083..8217e1d56b47 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb9614e8c6a6fdc4836f80ad0bc13d44
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 b8b7a4923b85..d676c3599978 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_cb_detector https://github.com/ros-perception/calibration
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge[python_single_target_python3_7(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bb9614e8c6a6fdc4836f80ad0bc13d44
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35fafcf5d2b4a2fbfd908f45c79c584a
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.15.0 b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
index aa1849160836..b79fe134cd9c 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.15.0
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc15caee7f0fa228cda1233b34ad8459
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4918a9195f4e968ca577cd3b6ca8affe
diff --git a/metadata/md5-cache/dev-ros/image_geometry-9999 b/metadata/md5-cache/dev-ros/image_geometry-9999
index e04389188042..8360d48a0f99 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc15caee7f0fa228cda1233b34ad8459
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4918a9195f4e968ca577cd3b6ca8affe
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.15.2 b/metadata/md5-cache/dev-ros/image_proc-1.15.2
index aec35d10eedf..b726bcb49ef8 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_proc-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54d1cab9cbc25699f774129e55de76e2
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index 363293d41200..e7a855b9ff3c 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Single image rectification and color processing
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_proc https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp media-libs/opencv:= dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=54d1cab9cbc25699f774129e55de76e2
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 841884b2374f..d134985fb42f 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b3e57918efd8fb2c61e22af78c3f5027
diff --git a/metadata/md5-cache/dev-ros/image_publisher-9999 b/metadata/md5-cache/dev-ros/image_publisher-9999
index 4474a5f45df1..65e7fec69688 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 21d40eaa7f88..291003c7a19b 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a092722c2f32c7c28dceff7d2c3463e2
diff --git a/metadata/md5-cache/dev-ros/image_rotate-9999 b/metadata/md5-cache/dev-ros/image_rotate-9999
index de67c679851b..d942620bf4f2 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-9999
+++ b/metadata/md5-cache/dev-ros/image_rotate-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 0b69ceab7e4a..5b173742d531 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.12.0
+++ b/metadata/md5-cache/dev-ros/image_transport-1.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index 8cb41a122b28..b3e1dc7acb67 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/image_view-1.15.2 b/metadata/md5-cache/dev-ros/image_view-1.15.2
index 60daff368954..594508d2e484 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.15.2
+++ b/metadata/md5-cache/dev-ros/image_view-1.15.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10c0bc18956c67f6eb1b24b2bec67602
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b8141dbe91fe5f566ee1bb082e1d5408
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index b0f5d9cba57c..22271e904eb2 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_view https://github.com/ros-perception/image_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] media-libs/opencv:= x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=10c0bc18956c67f6eb1b24b2bec67602
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b8141dbe91fe5f566ee1bb082e1d5408
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 cb21fb35d8e0..82e45d08a0b9 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,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 ef0a2536dc9f..93f6314747b4 100644
--- a/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
+++ b/metadata/md5-cache/dev-ros/imu_complementary_filter-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62e875d19cf311b6955b02a2d4dc422
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2
index 4916a15ab8ee..e5b3b21e6654 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-1.2.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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 dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1728a692bd3a2d1194ee06f6145f215
diff --git a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999 b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
index 2f63c97876ea..881c1efe80a5 100644
--- a/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
+++ b/metadata/md5-cache/dev-ros/imu_filter_madgwick-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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 dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f1728a692bd3a2d1194ee06f6145f215
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 cc8699d8c2df..cff63d2b114f 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_processors-9999 b/metadata/md5-cache/dev-ros/imu_processors-9999
index 7084e47f8faa..b47a7bac026f 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 6089606d3183..cbe088dc5efe 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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/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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6b3274acedd67ad393c05ed01680d9d
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-9999 b/metadata/md5-cache/dev-ros/imu_transformer-9999
index d3cae8542cff..d08a30446130 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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/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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a6b3274acedd67ad393c05ed01680d9d
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 32436c96b94f..61902e98b62e 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Interactive marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed4ac1c55e54e1e3c40811aa1d386167
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 dbf0163827ca..2fbcea96ae48 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Interactive marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed4ac1c55e54e1e3c40811aa1d386167
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c65cea054bfd871b0d3a59bd066b7cc1
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0 b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0
index 331643ad406b..cf94c31eed91 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.12.0.tar.gz -> interactive_markers-1.12.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35643f9e8f05439111bec7225f579822
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1e2e1e9826f3066285fa8ff0ebb36ff5
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-9999 b/metadata/md5-cache/dev-ros/interactive_markers-9999
index 734e3e19f947..05f6c7fe4b43 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35643f9e8f05439111bec7225f579822
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1e2e1e9826f3066285fa8ff0ebb36ff5
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 0bc83f233115..52a9059f984c 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Tools for calculating the intersection of interval messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2ad95ea37746528400822a99b2297f69
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-9999 b/metadata/md5-cache/dev-ros/interval_intersection-9999
index 3b3ee3927bae..9a9467f36abf 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-9999
+++ b/metadata/md5-cache/dev-ros/interval_intersection-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Tools for calculating the intersection of interval messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/interval_intersection https://github.com/ros-perception/calibration
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f9598d8f0141..20fd4e704d26 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.7
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Mesh Conversion Utility
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ivcon/archive/0.1.7.tar.gz -> ivcon-0.1.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/ivcon-9999 b/metadata/md5-cache/dev-ros/ivcon-9999
index ea7bd6b28c96..973bd494bfed 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Mesh Conversion Utility
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 7b2685a3ca55..4e5f042e2859 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f03f39b66ef348260e0553d07e63c58
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-9999 b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
index 417a444fc65e..ac8547d6d8a2 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_limits_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2f03f39b66ef348260e0553d07e63c58
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 c76bff0ff603..e03e80c7d473 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a78b6d43ae85fce85d85d1023a2741b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a824769f0baea30583cfe3a4270c9fa
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
index cfa63cb050de..0a8e8f2b2a67 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher https://github.com/ros/joint_state_publisher
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a78b6d43ae85fce85d85d1023a2741b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a824769f0baea30583cfe3a4270c9fa
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 4224031f5649..3955a84924cb 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/joint_state_publisher[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/joint_state_publisher/archive/1.15.0.tar.gz -> joint_state_publisher-1.15.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa2482195380d7eb965fc6813efaffdf
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 36a2eb0db921..18e1ad111b56 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher_gui-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/joint_state_publisher_gui https://github.com/ros/joint_state_publisher
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/joint_state_publisher[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/joint_state_publisher[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa2482195380d7eb965fc6813efaffdf
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 432ac07f8797..e4b96ce44c8e 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 18883fa7a52f..1b42b2200c41 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-9999
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/settlerlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 67bae2f9a89c..e14dd5877dcc 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_conversions https://github.com/ros/geometry
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-libs/orocos_kdl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfa7082a473c3cda915209c84bc2b03
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-9999 b/metadata/md5-cache/dev-ros/kdl_conversions-9999
index e9db3f964c13..521a1a24000d 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-libs/orocos_kdl:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_conversions https://github.com/ros/geometry
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-libs/orocos_kdl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-libs/orocos_kdl:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5bfa7082a473c3cda915209c84bc2b03
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.14.0 b/metadata/md5-cache/dev-ros/kdl_parser-1.14.0
index 5b611642aafc..6c2210837b8c 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.14.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.0.tar.gz -> kdl_parser-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de66875ba4bc0ca660ec7ac4e7b0a166
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64582dbef19766cd01df39add1b35278
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-9999 b/metadata/md5-cache/dev-ros/kdl_parser-9999
index 3cabe93faf14..af5a69653933 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=de66875ba4bc0ca660ec7ac4e7b0a166
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64582dbef19766cd01df39add1b35278
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
index e9614fd6e131..656477fe5268 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.0.tar.gz -> kdl_parser-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=835dd1ba427ced55bbbd56ec2c8c57c1
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7b7180df76fcf492f8d8335e79af870
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index c7b3e2bed863..1809d481618f 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/urdf-1.13[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=835dd1ba427ced55bbbd56ec2c8c57c1
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7b7180df76fcf492f8d8335e79af870
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 40aa8ee38806..d4c79fc855f5 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.8.tar.gz -> laser_assembler-1.7.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c5ebb7335f0060477ac07c01a27c77f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64281a7d918a2cc3e4e168982e57b81b
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-9999 b/metadata/md5-cache/dev-ros/laser_assembler-9999
index cc185055f684..dfc6704eb71b 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_single_target_python3_7(-)?] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_single_target_python3_7(-)?] dev-ros/filters python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c5ebb7335f0060477ac07c01a27c77f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 ece2dc13b29e..138a21b6e686 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b86d9c4de0d74efa693c573e108bc74a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b2fd172315e335530976ec56e5ab607
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index 106d1fb9341c..11eb863c27e5 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/cv_bridge media-libs/opencv:= dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b86d9c4de0d74efa693c573e108bc74a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b2fd172315e335530976ec56e5ab607
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 2463bdd594a8..363cd5ec285c 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.11
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.11.tar.gz -> laser_filters-1.8.11.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=313831bea8ffc4388db1796f145313f7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=928580a640be09799b2d537f2d7990f7
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index dfb78d5595c7..be2dfbaa3bde 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=313831bea8ffc4388db1796f145313f7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=928580a640be09799b2d537f2d7990f7
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.5 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
index ba976d4f9356..735f4b228302 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/angles dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.5.tar.gz -> laser_geometry-1.6.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b69664576658622603b101c871962ef9
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9460f6472e1b700131b063f8d449c4a8
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-9999 b/metadata/md5-cache/dev-ros/laser_geometry-9999
index 23e656d757c0..206f99a9088c 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/angles dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/angles python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b69664576658622603b101c871962ef9
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9460f6472e1b700131b063f8d449c4a8
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 ad5718500434..8dfef3064fd6 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.6
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/laser_proc-9999 b/metadata/md5-cache/dev-ros/laser_proc-9999
index fa3329eafd42..d4a4da4e7c21 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e3b7bf8c0569..445fcf44b895 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-1.2.0
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92d8286acc8bfb28a80de5f03254dbe5
diff --git a/metadata/md5-cache/dev-ros/libmavconn-9999 b/metadata/md5-cache/dev-ros/libmavconn-9999
index 1c5643359d64..948a98955e73 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=MAVLink communication library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=92d8286acc8bfb28a80de5f03254dbe5
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 e36e49e42a52..ec193af5d401 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.11.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89c98a2af4114c4e6738b01d90c21ef3
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-9999 b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
index c2337443ca21..bfa71e4aa572 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rviz dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89c98a2af4114c4e6738b01d90c21ef3
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.14.0 b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
index fa54b2ed6cfa..37bdea0368ab 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-1.14.0
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.0.tar.gz -> navigation_msgs-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7d9902613bec184d432f057ce4dd8eb2
diff --git a/metadata/md5-cache/dev-ros/map_msgs-9999 b/metadata/md5-cache/dev-ros/map_msgs-9999
index 4113de96d4ee..0fb8984773f3 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3e9452d009b6..76c3f6d905b3 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.17.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89fb709f5b11cc0225b43e4823fb6565
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index f95d34257706..10a5abc32864 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= test? ( dev-ros/rostest dev-ros/rospy dev-ros/rosunit ) dev-ros/nav_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Offers map data as a ROS service
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_server https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image dev-ros/tf2 >=dev-cpp/yaml-cpp-0.5:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=sci-physics/bullet:= dev-ros/roscpp media-libs/sdl-image 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=89fb709f5b11cc0225b43e4823fb6565
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7
index d0345ed66d43..3cdafd7fe6b5 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=MAVLink message marshaling library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=LGPL-3
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/future[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.7.7-2020.7.7.tar.gz -> mavlink-gbp-release-2020.7.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc1d6433b882242afb65b7ac36979208
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d763288f632d3a8194c7a1303a4c681e
diff --git a/metadata/md5-cache/dev-ros/mavros-1.2.0 b/metadata/md5-cache/dev-ros/mavros-1.2.0
index c19ecbe28d5e..221c73fc4cd8 100644
--- a/metadata/md5-cache/dev-ros/mavros-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index 93a16acac74d..9d47a37b5672 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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-2016.11.11 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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-2016.11.11 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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-2016.11.11 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=97a87f1d3c66eca22769bea745583b3a
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 baec43bf1d66..a3ea9bfed6c0 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index a0e405813f80..2d85ab1b4e29 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 2d8d8b2e08aa..1a3200cd4407 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f66daa314118b10711f88ec5629a5ef4
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index 15036f687a99..13ea0515ce66 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for MAVROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f66daa314118b10711f88ec5629a5ef4
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 3eae8ab297d6..4d38109d1ca5 100644
--- a/metadata/md5-cache/dev-ros/media_export-0.3.0
+++ b/metadata/md5-cache/dev-ros/media_export-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/media_export/archive/0.3.0.tar.gz -> media_export-0.3.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/media_export-9999 b/metadata/md5-cache/dev-ros/media_export-9999
index 469ae811fdaa..28ca409b2102 100644
--- a/metadata/md5-cache/dev-ros/media_export-9999
+++ b/metadata/md5-cache/dev-ros/media_export-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.7 b/metadata/md5-cache/dev-ros/message_filters-1.15.7
index 3d000cfa2711..5afb5f90beba 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.15.7
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3915210834679b7552c8bbf65b0fe8b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1783164c355bc33ad9fc871f8e3a699e
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.15.8 b/metadata/md5-cache/dev-ros/message_filters-1.15.8
new file mode 100644
index 000000000000..639329b1dc63
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_filters-1.15.8
@@ -0,0 +1,16 @@
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1783164c355bc33ad9fc871f8e3a699e
diff --git a/metadata/md5-cache/dev-ros/message_filters-9999 b/metadata/md5-cache/dev-ros/message_filters-9999
index 4e9fed7d3ea7..fda289c1c1f0 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of message filters which take in messages and outputs those at a later time
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_filters https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f3915210834679b7552c8bbf65b0fe8b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1783164c355bc33ad9fc871f8e3a699e
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 456702e02e5a..b3200e7e8f0f 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.1
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_generation-9999 b/metadata/md5-cache/dev-ros/message_generation-9999
index fde8b8196fbc..34afc41e723a 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4a1901a9e52a..767d2ccb0e12 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.13
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_runtime-9999 b/metadata/md5-cache/dev-ros/message_runtime-9999
index eeceb71d8f24..727793a77f8b 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e881d8026735..845bfbb40921 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-9999 b/metadata/md5-cache/dev-ros/message_to_tf-9999
index 14a323a09d52..4fece1dd1ffa 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3cdcc0e5e74a..e2cf730238ba 100644
--- a/metadata/md5-cache/dev-ros/mk-1.15.5
+++ b/metadata/md5-cache/dev-ros/mk-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-1.15.6 b/metadata/md5-cache/dev-ros/mk-1.15.6
new file mode 100644
index 000000000000..bfeb67d2b13b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mk-1.15.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+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
+IUSE=+python_single_target_python3_7 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d79830b7b58d1e5e05e9732db8df2874
diff --git a/metadata/md5-cache/dev-ros/mk-9999 b/metadata/md5-cache/dev-ros/mk-9999
index 3e4b02007e73..7a6f912c03cd 100644
--- a/metadata/md5-cache/dev-ros/mk-9999
+++ b/metadata/md5-cache/dev-ros/mk-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospack dev-ros/rosbuild python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 77ebdd533747..ee7d6fd790f8 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=503e9b03f37a667f005260056047f82c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9052ec866e058fb137edf6861a70c3d0
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-9999 b/metadata/md5-cache/dev-ros/monocam_settler-9999
index 50d1dc65ecbb..6e47592a71e4 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-9999
+++ b/metadata/md5-cache/dev-ros/monocam_settler-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=503e9b03f37a667f005260056047f82c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 8db0c0b083f4..6acc52f7e01b 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.17.0
+++ b/metadata/md5-cache/dev-ros/move_base-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e9d5b85609d3d781317f96c54f10d7d
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index c1b45728616a..38e575e57b74 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/base_local_planner dev-ros/clear_costmap_recovery dev-ros/navfn dev-ros/rotate_recovery dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib >=dev-ros/costmap_2d-1.15.1 dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/nav_core dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6e9d5b85609d3d781317f96c54f10d7d
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8008e49d8d1fbd3ca5295253dae9af32
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0 b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
index 666a59cdea44..e03a5efa52ba 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.0.tar.gz -> navigation_msgs-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=06c2a20a66b87f8c7ad0efdb6dc4846c
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-9999 b/metadata/md5-cache/dev-ros/move_base_msgs-9999
index bea87d47b4c1..4ae2b98d3fce 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a48d93aa76ae..52227fa1c82f 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999 b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
index 4d9fbfc8619d..1b93c6350693 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Move slow and clear
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_slow_and_clear https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:=[threads] dev-cpp/eigen:3 dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=9a58279222aca1163281df33cdf1af7f
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
index 132f99d61bb1..5cd70a99fa94 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.10.1.tar.gz -> moveit_msgs-0.10.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-9999 b/metadata/md5-cache/dev-ros/moveit_msgs-9999
index 8a184814c58c..7d1579b8071f 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8a7bf7df8856..2e21f1b5bc87 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.17.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=abfeeba4f628bdf673b6b1a9b7aca8ee
diff --git a/metadata/md5-cache/dev-ros/nav_core-9999 b/metadata/md5-cache/dev-ros/nav_core-9999
index 3da693784c07..586434abe49b 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_core https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e2b876926d85..434c901267d9 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=eb4d3011de1b0ea7cb75e163d2233678
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-9999 b/metadata/md5-cache/dev-ros/nav_msgs-9999
index 027ece47cf59..88b57d3e8e37 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nav_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 07c14509ebc3..1cb9be2e0026 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.17.0
+++ b/metadata/md5-cache/dev-ros/navfn-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= test? ( dev-cpp/gtest ) dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e35c60ae62d5a77f8938ba7810fb3071
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index c8d67f78b30f..cee83243679d 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
 DESCRIPTION=Fast interpolated navigation function for creating plans for a mobile base
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/navfn https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/costmap_2d-1.16 dev-ros/nav_core dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) 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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d1e66e50dda9..16c07a17ba6c 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-9999 b/metadata/md5-cache/dev-ros/nmea_msgs-9999
index 61980095ccf3..c971e09227d3 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.10.0 b/metadata/md5-cache/dev-ros/nodelet-1.10.0
index 9640c82a5b0a..c631919edb8b 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.10.0
+++ b/metadata/md5-cache/dev-ros/nodelet-1.10.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.10.0.tar.gz -> nodelet_core-1.10.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c806324014351ef140ec5bf9ac117ee
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ccf716e1f976bf44524d4b39a8319353
diff --git a/metadata/md5-cache/dev-ros/nodelet-9999 b/metadata/md5-cache/dev-ros/nodelet-9999
index ffc5513e0240..4cd58d7343ad 100644
--- a/metadata/md5-cache/dev-ros/nodelet-9999
+++ b/metadata/md5-cache/dev-ros/nodelet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c806324014351ef140ec5bf9ac117ee
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ccf716e1f976bf44524d4b39a8319353
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 6c85541ae603..65eeab8d3f0a 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df099c87ba3776c625a5843e90eab360
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=962551d30beb45ce589288347b0a18d3
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
index 396c9415dc09..a5c4f5dc5606 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df099c87ba3776c625a5843e90eab360
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 36d480b10853..bc5ad5a3196b 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
new file mode 100644
index 000000000000..43cdeb483035
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.2.0
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Nodelet tutorial
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
+IUSE=+python_single_target_python3_7 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
index 3b03c05a46dc..ea64da8a33fb 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Nodelet tutorial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/nodelet_tutorial_math https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2086caf097813e63bb91115c4a72df23
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1 b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
index d98f38302f2b..3804c2b87520 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wg-perception/object_recognition_msgs/archive/0.4.1.tar.gz -> object_recognition_msgs-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b22339b488a9..2ad1a862f811 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 603d017e3db1..4c4ce215dc7a 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.5.tar.gz -> octomap_msgs-0.3.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-9999 b/metadata/md5-cache/dev-ros/octomap_msgs-9999
index 8ba24f4c2c05..cb8b69ed24ba 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b41d645ea5e3..90b34598082f 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-9999 b/metadata/md5-cache/dev-ros/octomap_ros-9999
index 57c59bde2cb8..888b533c7cc0 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
index b3fc2ec67f4b..c384e368c35f 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.1.tar.gz -> opencv_apps-2.0.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=747e09a5c62b9bbcfcb97f7136b96bd1
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=996f277f5edd0928949f1fb064f925ed
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index 7fd98178b38b..d10a159764c9 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aa4b5e9b30655f6af10def42577200cd
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b56cb0eba749cbd19e4821c7ac52c2b6
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 bc5f1a2029cf..1c5d944be802 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1c8a3c7903141646f98c8f1df01d1ee
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc0f3e3487d5f637737b0c38750155f4
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-9999 b/metadata/md5-cache/dev-ros/opencv_tests-9999
index b4de64c8cfcd..6ed7a844fd94 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( media-libs/opencv[python,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1c8a3c7903141646f98c8f1df01d1ee
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 cb053807b892..eaf16b1cf385 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9d35c23720ba6445bd98ae88ba12e70
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ac228684ed4d61c4a9a9369c0d96fe62
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-9999 b/metadata/md5-cache/dev-ros/openni2_camera-9999
index f1fe34a1fa69..eaeecfd6a740 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9d35c23720ba6445bd98ae88ba12e70
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 d6d7a88ca65b..0cb4b8526bf4 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+++ b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index 8fbd93aef115..19289591ef46 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 6c9ce1447287..577474a41bc3 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.2.1.tar.gz -> openslam_gmapping-0.2.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7890d310f96776aed32e6b912cb76b99
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-9999 b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
index 23e04054237d..44dc190dd2b9 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=CC-BY-NC-SA-2.5
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7890d310f96776aed32e6b912cb76b99
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 38f0a9bb7a93..0e7092ee1a9f 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index 34dcfec8e198..e5591e6a32ef 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4d8b1127ef14..38052968727c 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pcl_msgs/archive/0.3.0.tar.gz -> pcl_msgs-0.3.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-9999 b/metadata/md5-cache/dev-ros/pcl_msgs-9999
index dd3beccd10a3..a085889ea2ae 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1 b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
index 67735667742e..845fe59a4702 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b16e490d9229b3cf5f9b0436d8e98ea7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c5425750e49cb1f9d2d3fba771c67c2b
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index ce58dc693c3a..2394463d0ebd 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1906362b0e70cbd289bdcb56a0c21d69
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=84c2cf0c690ea836c1209235d30ad8d7
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.13.0 b/metadata/md5-cache/dev-ros/pluginlib-1.13.0
index 0d870c52125b..7bd9f5eabf6f 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.13.0
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/pluginlib/archive/1.13.0.tar.gz -> pluginlib-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fef8c6efe8439f1fa4f87ef413dbd39
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1b2f54ee11409879feb312fc078af03a
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index 37dfcd67a05c..5b72ebb69463 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1fef8c6efe8439f1fa4f87ef413dbd39
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1b2f54ee11409879feb312fc078af03a
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 1941b2eb5ffc..668c56e11515 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
new file mode 100644
index 000000000000..1845f2ab6a5e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.2.0
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Pluginlib tutorials
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
+IUSE=+python_single_target_python3_7 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=53016e53951fed5a9041fcc620dbcf95
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
index cbe9fa172a65..f62c6f44a461 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Pluginlib tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib_tutorials https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=53016e53951fed5a9041fcc620dbcf95
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 e052bc77bab1..2f91e51b2c13 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 89fce1088091..4fad56b2c168 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 087bea4d1c46..7e1e1b946862 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.12.0
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/polled_camera-9999 b/metadata/md5-cache/dev-ros/polled_camera-9999
index e8b36ff7ca19..35f3b903ff09 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 19cd65457445..6f863f1329b3 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c05b8d5be8f060e9154f453c3431e63
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 1b56e4b4f0d8..e7275bf09a92 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/pr2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7c05b8d5be8f060e9154f453c3431e63
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 b4cfc426968a..ba7f6f581efd 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7a2c9ae5ef4a842bd2dda2e238c0622
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19ddc03e0f756c0b5b54f3dea5e9e083
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index f37e0e78bbbb..b2f56f5efb85 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/xacro[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7a2c9ae5ef4a842bd2dda2e238c0622
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=19ddc03e0f756c0b5b54f3dea5e9e083
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 3fbd64ce16b8..b3d939b0d034 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-9999 b/metadata/md5-cache/dev-ros/pr2_machine-9999
index a7fa4ee15e2c..e23b748a7554 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 7529394b6887..662dcc8ea151 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-9999 b/metadata/md5-cache/dev-ros/pr2_msgs-9999
index 5bbd0cc9230d..efe7c73a6436 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for representing PR2 state
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3 b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3
index 0825a05d8e9d..18e3432462cf 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.4.3.tar.gz -> python_qt_binding-0.4.3.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14f113e6532515a4eb784a9e11f9a0c3
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b6a85926bc4c31df23b8e107f8c76a2
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-9999 b/metadata/md5-cache/dev-ros/python_qt_binding-9999
index 2b8861aeed9f..ba9071d6f34b 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/PyQt5[gui,widgets,python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14f113e6532515a4eb784a9e11f9a0c3
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4b6a85926bc4c31df23b8e107f8c76a2
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 26fc8d427dc5..4a34a47f6ab1 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pydot[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygraphviz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/pydot[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60bc6d4c8907891c5f713362444641fc
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..43b215563620
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.4.2
@@ -0,0 +1,16 @@
+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(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Helpers to work with dot graphs
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfa163b8c6fdf99f4f14ea141e7f67cb
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-9999 b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
index 43e57714bc3a..29447074dde5 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-9999
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pydot[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pygraphviz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pygraphviz[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/qt_dotgraph https://github.com/ros-visualization/qt_gui_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/pydot[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/pydot[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=60bc6d4c8907891c5f713362444641fc
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 88a72cecade1..55b8fa059179 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c51033a93644bf676bd14ff055d40b6
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..d30f17792fe9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.4.2
@@ -0,0 +1,16 @@
+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(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+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
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cd903a3b5029b642f7cb747ac889bf94
diff --git a/metadata/md5-cache/dev-ros/qt_gui-9999 b/metadata/md5-cache/dev-ros/qt_gui-9999
index 25bf2176a302..7b7de9b16560 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-qt/qtcore:5 dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-qt/qtcore:5 python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c51033a93644bf676bd14ff055d40b6
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 af5c02d114cb..bc75b572242c 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56733723b8f9712a0ea3ef79e8aee8a6
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..4cf00d6cc2a7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.4.2
@@ -0,0 +1,16 @@
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=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
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 e6572b7ade29..b714e59409fc 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56733723b8f9712a0ea3ef79e8aee8a6
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01a03656edf641e8bfa800cf75d2fd6d
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
index 44ef85317fc1..0796e6cb3678 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4dc932928431da39bf1ce6660631e858
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8f1f8ada8f7c5835bc5919d6190b5235
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
new file mode 100644
index 000000000000..95265025466f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja 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(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+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
+IUSE=+python_single_target_python3_7 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(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2fc17b9ae540cf6395e7937bd73ccdb8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index 3ee949286f75..e913e6cf74bd 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= dev-libs/console_bridge:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28dd1a42d3b96bf1c1d0e86af8763dde
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2fc17b9ae540cf6395e7937bd73ccdb8
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 c0a086a9d49d..e1045d421df7 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.1.tar.gz -> qt_gui_core-0.4.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e3127a073607ba7381f0083cf90d68e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..92ff7bb4cfb5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.4.2
@@ -0,0 +1,16 @@
+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(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+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
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.4.2.tar.gz -> qt_gui_core-0.4.2.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 4b5c1d07ecb2..cbeaae044e27 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) >=dev-ros/python_qt_binding-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1e3127a073607ba7381f0083cf90d68e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 40fe2e36c7ba..03fb8d147342 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.2
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.2.tar.gz -> random_numbers-0.3.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e2da958e332fed47263a047239460ef
diff --git a/metadata/md5-cache/dev-ros/random_numbers-9999 b/metadata/md5-cache/dev-ros/random_numbers-9999
index c02d7f254eee..d5c89a8dffac 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-9999
+++ b/metadata/md5-cache/dev-ros/random_numbers-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7e2da958e332fed47263a047239460ef
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.16.0 b/metadata/md5-cache/dev-ros/realtime_tools-1.16.0
index e7045ed96072..bc9864435d67 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.16.0
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.16.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.16.0.tar.gz -> realtime_tools-1.16.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81d8a9a0ef2555507c44c5dc1439804a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce6e54b526a1072b191e90f9f0c71211
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-9999 b/metadata/md5-cache/dev-ros/realtime_tools-9999
index fcbc1ddbd8b8..0c8b7997f5a1 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-9999
+++ b/metadata/md5-cache/dev-ros/realtime_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81d8a9a0ef2555507c44c5dc1439804a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce6e54b526a1072b191e90f9f0c71211
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 229a13b541cc..e7d1b7850e6a 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/curl dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Retrieves data from url-format files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/resource_retriever https://github.com/ros/resource_retriever
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/curl dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.6.tar.gz -> resource_retriever-1.12.6.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e840f8eabc72ed9566178c341774888a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6764261637ecfddd8777be1b6656178f
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-9999 b/metadata/md5-cache/dev-ros/resource_retriever-9999
index 74b26e090b29..c784faa71189 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-9999
+++ b/metadata/md5-cache/dev-ros/resource_retriever-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/curl dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Retrieves data from url-format files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/resource_retriever https://github.com/ros/resource_retriever
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] net-misc/curl dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_single_target_python3_7(-)?] net-misc/curl python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e840f8eabc72ed9566178c341774888a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6764261637ecfddd8777be1b6656178f
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 517d1eae493a..d14381429751 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.3.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rgbd_launch https://github.com/ros-drivers/rgbd_launch
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a0172aa3b993be0c56d9d9cf0efa7a6
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-9999 b/metadata/md5-cache/dev-ros/rgbd_launch-9999
index 2fae87b9ee36..6e6993790e45 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-9999
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rgbd_launch https://github.com/ros-drivers/rgbd_launch
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6a0172aa3b993be0c56d9d9cf0efa7a6
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.6.8 b/metadata/md5-cache/dev-ros/robot_localization-2.6.8
index 3b8853cd473b..8f167f3589ca 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-2.6.8
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.6.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/roslint dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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:= 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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:= 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.6.8.tar.gz -> robot_localization-2.6.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a00168896e2921956fbee1db3e75bfbc
diff --git a/metadata/md5-cache/dev-ros/robot_localization-9999 b/metadata/md5-cache/dev-ros/robot_localization-9999
index abe43990e912..9da051ffa2aa 100644
--- a/metadata/md5-cache/dev-ros/robot_localization-9999
+++ b/metadata/md5-cache/dev-ros/robot_localization-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/roslint >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater 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:= 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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:= 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Package of nonlinear state estimation nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/robot_localization https://github.com/cra-ros-pkg/robot_localization
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=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:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a00168896e2921956fbee1db3e75bfbc
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 c86c153f33e1..835426ce70bc 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd50382a7f7dd0f9ee80acf230772e5b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3b640bfa9f20cd5bc78eef3a4827cf9
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999 b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
index 51c9b065354d..1d4269dc0e48 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) virtual/pkgconfig python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf sci-libs/orocos-bfl dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd50382a7f7dd0f9ee80acf230772e5b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c3b640bfa9f20cd5bc78eef3a4827cf9
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 91cd05c42b06..0d8d770c433e 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8696866b754c..d664fc7cd834 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 d082b6a7252e..0eee7e7b410b 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6927162ff492851111eac897dded4a5a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=298713cfb21c2f51232e4e3b8ffc89e7
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-9999 b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
index 0796eee8835b..8e75635feb76 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6927162ff492851111eac897dded4a5a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=298713cfb21c2f51232e4e3b8ffc89e7
diff --git a/metadata/md5-cache/dev-ros/ros_environment-1.3.1 b/metadata/md5-cache/dev-ros/ros_environment-1.3.1
index f4f438c8bca3..15310f75a726 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-1.3.1
+++ b/metadata/md5-cache/dev-ros/ros_environment-1.3.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!!<dev-ros/roslib-1.14.3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS environment variables
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_environment https://github.com/ros/ros_environment
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=!!<dev-ros/roslib-1.14.3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_environment/archive/1.3.1.tar.gz -> ros_environment-1.3.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/ros_environment-9999 b/metadata/md5-cache/dev-ros/ros_environment-9999
index f02ab183dd7d..703f4dbd03b7 100644
--- a/metadata/md5-cache/dev-ros/ros_environment-9999
+++ b/metadata/md5-cache/dev-ros/ros_environment-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!!<dev-ros/roslib-1.14.3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS environment variables
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/ros_environment https://github.com/ros/ros_environment
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=!!<dev-ros/roslib-1.14.3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5f1e9ed0b71fdc39497a11cbd2ca30f6
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.11.9 b/metadata/md5-cache/dev-ros/rosapi-0.11.9
index 053c63c918d2..eeca5e1c90ed 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosapi-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=331eae8fd279e5583db359d40a96c060
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=334c761331a30942a4cbaf72301566e6
diff --git a/metadata/md5-cache/dev-ros/rosapi-9999 b/metadata/md5-cache/dev-ros/rosapi-9999
index fde0109a1bd8..d8ebaa1131b1 100644
--- a/metadata/md5-cache/dev-ros/rosapi-9999
+++ b/metadata/md5-cache/dev-ros/rosapi-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Service calls for getting ros meta-information
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosapi https://github.com/RobotWebTools/rosbridge_suite
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=331eae8fd279e5583db359d40a96c060
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 0d269764a8a9..4784b56c8213 100644
--- a/metadata/md5-cache/dev-ros/rosauth-1.0.1
+++ b/metadata/md5-cache/dev-ros/rosauth-1.0.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b72194f79e1fb0254a63fceb8b2c089a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cdc1b11df85ffc91e68a61a54fe0d804
diff --git a/metadata/md5-cache/dev-ros/rosauth-9999 b/metadata/md5-cache/dev-ros/rosauth-9999
index 2f2e6843dc6c..865494cce5cf 100644
--- a/metadata/md5-cache/dev-ros/rosauth-9999
+++ b/metadata/md5-cache/dev-ros/rosauth-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/openssl:0= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/openssl:0= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b72194f79e1fb0254a63fceb8b2c089a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cdc1b11df85ffc91e68a61a54fe0d804
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.7 b/metadata/md5-cache/dev-ros/rosbag-1.15.7
index 4d17ec4825ca..9697216ba710 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/console_bridge:= dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=lz4 python_targets_python3_6 test
+IUSE=lz4 +python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/rosbag_storage-1.14 dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/console_bridge:= dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] lz4? ( dev-ros/roslz4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e837457cc74df1a2158f374d7253f07
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.15.8 b/metadata/md5-cache/dev-ros/rosbag-1.15.8
new file mode 100644
index 000000000000..a0b3739610ac
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag-1.15.8
@@ -0,0 +1,16 @@
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=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
+IUSE=lz4 +python_single_target_python3_7 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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c7643c9b0b0b5996275624f27dced515
diff --git a/metadata/md5-cache/dev-ros/rosbag-9999 b/metadata/md5-cache/dev-ros/rosbag-9999
index a42c6da337c0..97f6b2ad5780 100644
--- a/metadata/md5-cache/dev-ros/rosbag-9999
+++ b/metadata/md5-cache/dev-ros/rosbag-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/console_bridge:= dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=lz4 python_targets_python3_6 test
+IUSE=lz4 +python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/console_bridge:= dev-python/pycryptodome[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python-gnupg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] lz4? ( dev-ros/roslz4[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/genpy[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/console_bridge:= python_single_target_python3_7? ( dev-python/pycryptodome[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/python-gnupg[python_targets_python3_7(-)] ) lz4? ( dev-ros/roslz4[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e837457cc74df1a2158f374d7253f07
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 b4ae97d18a98..a6d6b198c222 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/rosbag_migration_rule/archive/1.0.1.tar.gz -> rosbag_migration_rule-1.0.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 7040b4b13b88..835bd1e97679 100644
--- a/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_migration_rule-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=016be3e9e4e5c5c8c0fd99b41c6d0b82
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
index 2039a65f758b..7233bc5612ab 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8 b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
new file mode 100644
index 000000000000..ba7330342b7b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Set of tools for recording from and playing back ROS message
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 5a03cb0f4961..36ab39f18c54 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/console_bridge app-crypt/gpgme dev-ros/pluginlib dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 dev-libs/console_bridge:= dev-libs/tinyxml2:= dev-libs/openssl:0= app-crypt/gpgme python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b376a886272105ae167556a4bccaf26f
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.5 b/metadata/md5-cache/dev-ros/rosbash-1.15.5
index 26fd595583c3..b80b53e196f9 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospack python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospack python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.15.6 b/metadata/md5-cache/dev-ros/rosbash-1.15.6
new file mode 100644
index 000000000000..258f1dc717b7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbash-1.15.6
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Assorted shell commands for using ros with bash
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e2e3eb8f120546c7f59dcf656d9c116a
diff --git a/metadata/md5-cache/dev-ros/rosbash-9999 b/metadata/md5-cache/dev-ros/rosbash-9999
index b88765dc64e9..c94c96de7ab8 100644
--- a/metadata/md5-cache/dev-ros/rosbash-9999
+++ b/metadata/md5-cache/dev-ros/rosbash-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospack python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbash https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospack python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospack python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 4c5b48d41ff1..8f87cfc54cb2 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
new file mode 100644
index 000000000000..e297bd1a0bcf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.15.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+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
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=206b5a5b394c5137c7ef2ae24f3e8129
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-9999 b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
index 15542b9c6637..33730221716c 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-9999
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=206b5a5b394c5137c7ef2ae24f3e8129
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 81a3c2d418d6..47ac3316f5e2 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pymongo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pymongo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1d42f2096c7849fe9b0225173131858
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=382c5a760c9f032063700e284a01981d
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-9999 b/metadata/md5-cache/dev-ros/rosbridge_library-9999
index e544516fc9fc..75b5324eeef6 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pymongo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy_tutorials[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/stereo_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/trajectory_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/visualization_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pymongo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pymongo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e1d42f2096c7849fe9b0225173131858
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=382c5a760c9f032063700e284a01981d
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 54a631249768..02067bcf150c 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=991e48acf060130eba0eb87b4f245e6b
diff --git a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999 b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
index a3afecdae1ff..637783e83775 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Package containing message files for rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_msgs https://github.com/RobotWebTools/rosbridge_suite
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=991e48acf060130eba0eb87b4f245e6b
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 81846e7e328e..ab5491719f31 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.11.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbridge_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosapi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosauth[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/autobahn[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbridge_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosapi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosauth[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/autobahn[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.11.9.tar.gz -> rosbridge_suite-0.11.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=729e36874000a2c426d45c516ba441ad
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=470015f6c6cbaefba6783708c2acf304
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-9999 b/metadata/md5-cache/dev-ros/rosbridge_server-9999
index 3a2e2c912323..02a05ce9edc9 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbridge_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosapi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosauth[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/autobahn[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbridge_server https://github.com/RobotWebTools/rosbridge_suite
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbridge_library[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbridge_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosapi[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosauth[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/autobahn[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/twisted[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosbridge_library[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosbridge_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosapi[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosauth[python_single_target_python3_7(-)?] python_single_target_python3_7? ( www-servers/tornado[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/autobahn[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/twisted[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=729e36874000a2c426d45c516ba441ad
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 598f804c4c77..761116ecdbd7 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.15.6 b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
new file mode 100644
index 000000000000..2ce62361e85e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.15.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Scripts for managing the CMake-based build system for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fb0e89330a0b9383ba078280f7bdfd81
diff --git a/metadata/md5-cache/dev-ros/rosbuild-9999 b/metadata/md5-cache/dev-ros/rosbuild-9999
index 3da3ab8f4c1d..39f92fa34de3 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-9999
+++ b/metadata/md5-cache/dev-ros/rosbuild-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosbuild https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 2461f94c2180..ec76ac206127 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dc6f059da6989cb3ddb636a5e6bf092
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.15.6 b/metadata/md5-cache/dev-ros/rosclean-1.15.6
new file mode 100644
index 000000000000..ab5d563b8bf1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosclean-1.15.6
@@ -0,0 +1,16 @@
+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(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Cleanup filesystem resources (e.g. log files)
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba0b60832be714480e60501292f3cf22
diff --git a/metadata/md5-cache/dev-ros/rosclean-9999 b/metadata/md5-cache/dev-ros/rosclean-9999
index df16ea2f2e3d..5bd0ed79c169 100644
--- a/metadata/md5-cache/dev-ros/rosclean-9999
+++ b/metadata/md5-cache/dev-ros/rosclean-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosclean https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0dc6f059da6989cb3ddb636a5e6bf092
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 8a817a680b8d..ed7342f6b75b 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.14.0
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.14.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
-IUSE=+log4cxx glog python_targets_python3_6 test
+IUSE=+log4cxx glog +python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=cd2cd90c4da2a7aab92ca685c01d9053
diff --git a/metadata/md5-cache/dev-ros/rosconsole-9999 b/metadata/md5-cache/dev-ros/rosconsole-9999
index adbec9c40728..ea29908665e5 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS console output library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosconsole https://github.com/ros/rosconsole
-IUSE=+log4cxx glog python_targets_python3_6 test
+IUSE=+log4cxx glog +python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 a40e41f9b68b..58e15dd5f2dd 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.5.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef83949d69304343a9efba003de0a8fb
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999 b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
index a0f385f483d1..188c6ffe3c8a 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ef83949d69304343a9efba003de0a8fb
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.7 b/metadata/md5-cache/dev-ros/roscpp-1.15.7
index cca2b2dc1312..c6ff7b8d4fbf 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76c0f153c3a9ad7d28f851429461686d
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.15.8 b/metadata/md5-cache/dev-ros/roscpp-1.15.8
new file mode 100644
index 000000000000..b8a3114ef698
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscpp-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DESCRIPTION=C++ implementation of ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76c0f153c3a9ad7d28f851429461686d
diff --git a/metadata/md5-cache/dev-ros/roscpp-9999 b/metadata/md5-cache/dev-ros/roscpp-9999
index f0cb7969e2c4..0415b495345f 100644
--- a/metadata/md5-cache/dev-ros/roscpp-9999
+++ b/metadata/md5-cache/dev-ros/roscpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=C++ implementation of ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=76c0f153c3a9ad7d28f851429461686d
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 15606537e348..c01f43f75d74 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Code for serialization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_serialization https://github.com/ros/roscpp_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7c44874a13858d172a270c905d8f7d8d
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-9999 b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
index 3cdd95538b0b..9c6900e4b156 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Code for serialization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_serialization https://github.com/ros/roscpp_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 ad561d2c5320..2d7380f6bffc 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Message traits code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_traits https://github.com/ros/roscpp_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.7.2.tar.gz -> roscpp_core-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=e39f2c98a32da1734dc1721a4959cefa
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-9999 b/metadata/md5-cache/dev-ros/roscpp_traits-9999
index 60e9387c4d18..af23d489df5a 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Message traits code
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscpp_traits https://github.com/ros/roscpp_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cpp_common dev-ros/rostime python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 2270dc8dc9c7..5ff4d49e0158 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999 b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
index 31eef9c39920..f072813edffa 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=774d828732fa665b9bad6c050613ef65
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.15.5 b/metadata/md5-cache/dev-ros/roscreate-1.15.5
index 52c86f9de44f..88963f403c1b 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.15.5
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=053e42f9227742b15b7e2a53be79abdf
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5945aeabfdfdffb9f6feeb8965305df1
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.15.6 b/metadata/md5-cache/dev-ros/roscreate-1.15.6
new file mode 100644
index 000000000000..54d76c7ddc8d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roscreate-1.15.6
@@ -0,0 +1,16 @@
+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(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5945aeabfdfdffb9f6feeb8965305df1
diff --git a/metadata/md5-cache/dev-ros/roscreate-9999 b/metadata/md5-cache/dev-ros/roscreate-9999
index ca128cd91715..2a3076c90249 100644
--- a/metadata/md5-cache/dev-ros/roscreate-9999
+++ b/metadata/md5-cache/dev-ros/roscreate-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roscreate https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=053e42f9227742b15b7e2a53be79abdf
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5945aeabfdfdffb9f6feeb8965305df1
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4 b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
index bf1bbd86b7de..e89ad4c6f5bc 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.9.4.tar.gz -> diagnostics-1.9.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2722212e58121025a0a53be2380c7ef0
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosdiagnostic-9999 b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
index c6773874e136..68576a15ca7b 100644
--- a/metadata/md5-cache/dev-ros/rosdiagnostic-9999
+++ b/metadata/md5-cache/dev-ros/rosdiagnostic-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command to print aggregated diagnostic contents to the command line
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosdiagnostic https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2722212e58121025a0a53be2380c7ef0
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c387a0d56f1eb1156375350926eb2717
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.7 b/metadata/md5-cache/dev-ros/rosgraph-1.15.7
index 7fbdfcfd1c5d..55feef5d2064 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0525c496a35f27b86e23800dd5ca4e4
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0683adafaae6ebef26fd758b66ce3ca9
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.15.8 b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
new file mode 100644
index 000000000000..99c927750885
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Prints information about the ROS Computation Graph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0683adafaae6ebef26fd758b66ce3ca9
diff --git a/metadata/md5-cache/dev-ros/rosgraph-9999 b/metadata/md5-cache/dev-ros/rosgraph-9999
index 5c78f6e4f58f..1901aa786036 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/netifaces[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/netifaces[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0525c496a35f27b86e23800dd5ca4e4
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0683adafaae6ebef26fd758b66ce3ca9
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 b7a06096909c..acef67068c68 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph_msgs https://github.com/ros/ros_comm_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4cf45a13da9a6d2d3d580a6bdc6a1b17
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999 b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
index 6bc720ebc060..4987e239fcdb 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosgraph_msgs https://github.com/ros/ros_comm_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 c0630ecd3575..7ff8542dc710 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.15.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-1.15.6 b/metadata/md5-cache/dev-ros/roslang-1.15.6
new file mode 100644
index 000000000000..c75ccd59b0cc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslang-1.15.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Common package for all ROS client libraries
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslang-9999 b/metadata/md5-cache/dev-ros/roslang-9999
index b24d9a4494f3..f54321c69c70 100644
--- a/metadata/md5-cache/dev-ros/roslang-9999
+++ b/metadata/md5-cache/dev-ros/roslang-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslang https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=55118fe6333523938e2a9540c5e817cb
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.7 b/metadata/md5-cache/dev-ros/roslaunch-1.15.7
index 9d8e415f298c..04f1daa8afb1 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.15.7
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4a4497a0d598763212e4beb3b194884
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0516d5fd31e564acfb84127d1b2e221b
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.15.8 b/metadata/md5-cache/dev-ros/roslaunch-1.15.8
new file mode 100644
index 000000000000..c500d118930a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Tool for easily launching multiple ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0516d5fd31e564acfb84127d1b2e221b
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index a10bd6532d38..674756fb5ca5 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install preinst prepare test unpack
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install preinst prepare setup test unpack
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout test? ( python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosclean[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosout python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosclean[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosparam[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] dev-ros/rosout python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4a4497a0d598763212e4beb3b194884
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	user	7b7fc6ec5eb1c1eee55b0609f01e7362	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0516d5fd31e564acfb84127d1b2e221b
diff --git a/metadata/md5-cache/dev-ros/roslib-1.15.5 b/metadata/md5-cache/dev-ros/roslib-1.15.5
deleted file mode 100644
index 0ae8a203c1d8..000000000000
--- a/metadata/md5-cache/dev-ros/roslib-1.15.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Base dependencies and support libraries for ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32d0ac69d0a2a8b05ed1fea0880c2b93
diff --git a/metadata/md5-cache/dev-ros/roslib-1.15.6 b/metadata/md5-cache/dev-ros/roslib-1.15.6
new file mode 100644
index 000000000000..b3f37b4b4bf1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslib-1.15.6
@@ -0,0 +1,16 @@
+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(-)] ) 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Base dependencies and support libraries for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=86845e04ccecba053e83782378e5607a
diff --git a/metadata/md5-cache/dev-ros/roslib-9999 b/metadata/md5-cache/dev-ros/roslib-9999
index 3633ec8a3924..ead3fd14ab67 100644
--- a/metadata/md5-cache/dev-ros/roslib-9999
+++ b/metadata/md5-cache/dev-ros/roslib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment test? ( dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)] ) 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslib https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-ros/ros_environment python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( >=dev-python/rospkg-1.0.37[python_targets_python3_7(-)] ) 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32d0ac69d0a2a8b05ed1fea0880c2b93
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=86845e04ccecba053e83782378e5607a
diff --git a/metadata/md5-cache/dev-ros/roslint-0.12.0 b/metadata/md5-cache/dev-ros/roslint-0.12.0
index e9376fa1f4b8..c71f04c1cc58 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.12.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.12.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/roslint/archive/0.12.0.tar.gz -> roslint-0.12.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ec82278f8ac33dd91b78746ed1ff8d3
diff --git a/metadata/md5-cache/dev-ros/roslint-9999 b/metadata/md5-cache/dev-ros/roslint-9999
index 70f1f75f2108..f2f1b683c1be 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0ec82278f8ac33dd91b78746ed1ff8d3
diff --git a/metadata/md5-cache/dev-ros/roslisp-1.9.24 b/metadata/md5-cache/dev-ros/roslisp-1.9.24
index 2888c88a50d9..7a4553795b92 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.24
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.24
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Lisp client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslisp https://github.com/ros/roslisp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50820048bc92b86e42b6f2f85d7863da
diff --git a/metadata/md5-cache/dev-ros/roslisp-9999 b/metadata/md5-cache/dev-ros/roslisp-9999
index ee8a50672547..7f4c6e6a8ac7 100644
--- a/metadata/md5-cache/dev-ros/roslisp-9999
+++ b/metadata/md5-cache/dev-ros/roslisp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Lisp client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslisp https://github.com/ros/roslisp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=50820048bc92b86e42b6f2f85d7863da
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.7 b/metadata/md5-cache/dev-ros/roslz4-1.15.7
index fed2ce5cba02..a2c88a8d6ad1 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.15.7
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=app-arch/lz4 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=app-arch/lz4 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=209f4a335992457e67bb14c4a82f9cb7
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.15.8 b/metadata/md5-cache/dev-ros/roslz4-1.15.8
new file mode 100644
index 000000000000..eb75946a0bf4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roslz4-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=app-arch/lz4 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=209f4a335992457e67bb14c4a82f9cb7
diff --git a/metadata/md5-cache/dev-ros/roslz4-9999 b/metadata/md5-cache/dev-ros/roslz4-9999
index 7e44a6dc0ac9..3016e4247e61 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roslz4 https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=app-arch/lz4 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=app-arch/lz4 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=209f4a335992457e67bb14c4a82f9cb7
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.5 b/metadata/md5-cache/dev-ros/rosmake-1.15.5
index 2ea6e163269d..a6630332363a 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddf9c476adb74ad3d5f667c8ccd11023
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.15.6 b/metadata/md5-cache/dev-ros/rosmake-1.15.6
new file mode 100644
index 000000000000..1e033cdf30f0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmake-1.15.6
@@ -0,0 +1,16 @@
+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(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=ROS dependency aware build tool
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmake-9999 b/metadata/md5-cache/dev-ros/rosmake-9999
index cf335d04bdd5..720d6ea46b66 100644
--- a/metadata/md5-cache/dev-ros/rosmake-9999
+++ b/metadata/md5-cache/dev-ros/rosmake-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS dependency aware build tool
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmake https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ddf9c476adb74ad3d5f667c8ccd11023
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d749d18aaddb49f31a887602656957cb
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.7 b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
index 39edba456bbd..c884cdff633f 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a9ea57ac8fbec9c85ef085605cc055c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.15.8 b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
new file mode 100644
index 000000000000..5031be08e7dd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=ROS Master implementation
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmaster-9999 b/metadata/md5-cache/dev-ros/rosmaster-9999
index b059dd005ef2..e44acdaef78b 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=ROS Master implementation
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/defusedxml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/defusedxml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9a9ea57ac8fbec9c85ef085605cc055c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0e99df6e26ec3c6d8c3a2af12a187f69
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.7 b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
index ea9388c8c6ba..253919a82684 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=248a675bedf96fbd6eeff06645e7d616
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4bd8500232cc1d40d1642c3c47a1f719
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.15.8 b/metadata/md5-cache/dev-ros/rosmsg-1.15.8
new file mode 100644
index 000000000000..64569ba10014
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Command-line tools for displaying information about message and services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4bd8500232cc1d40d1642c3c47a1f719
diff --git a/metadata/md5-cache/dev-ros/rosmsg-9999 b/metadata/md5-cache/dev-ros/rosmsg-9999
index ec7cad28b596..578e4a9780ec 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosmsg https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosbag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=248a675bedf96fbd6eeff06645e7d616
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4bd8500232cc1d40d1642c3c47a1f719
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.7 b/metadata/md5-cache/dev-ros/rosnode-1.15.7
index 304d3a0d93b5..a8a7a620e2dd 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fef6d203f36e3a09e4fee0b57ad138b5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d91cfe798c6aaf51a4e7279f89823655
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.15.8 b/metadata/md5-cache/dev-ros/rosnode-1.15.8
new file mode 100644
index 000000000000..00c052cca3dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosnode-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d91cfe798c6aaf51a4e7279f89823655
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index 56e0d2b415e7..ed33bbea08f6 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosnode https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/genmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fef6d203f36e3a09e4fee0b57ad138b5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d91cfe798c6aaf51a4e7279f89823655
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.7 b/metadata/md5-cache/dev-ros/rosout-1.15.7
index 749dc0813687..e47d3454dbd7 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-1.15.8 b/metadata/md5-cache/dev-ros/rosout-1.15.8
new file mode 100644
index 000000000000..027cf48b3f1f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosout-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5acd9311aaeb96df2200f42788a0f9ca
diff --git a/metadata/md5-cache/dev-ros/rosout-9999 b/metadata/md5-cache/dev-ros/rosout-9999
index b9c9d4bf5990..d1b198319064 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosout https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 1432424ab7f3..a6b417768b0a 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.6.2
+++ b/metadata/md5-cache/dev-ros/rospack-2.6.2
@@ -1,16 +1,16 @@
 BDEPEND=>=dev-ros/cmake_modules-0.4.1 dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospack https://github.com/ros/rospack
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3004cce08dc048d47c82bc9fdd0f4191
diff --git a/metadata/md5-cache/dev-ros/rospack-9999 b/metadata/md5-cache/dev-ros/rospack-9999
index a457d07cec0e..f07879447591 100644
--- a/metadata/md5-cache/dev-ros/rospack-9999
+++ b/metadata/md5-cache/dev-ros/rospack-9999
@@ -1,15 +1,15 @@
 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 test unpack
-DEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= test? ( dev-cpp/gtest dev-python/nose ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospack https://github.com/ros/rospack
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= >=dev-libs/tinyxml2-5:= dev-ros/ros_environment python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3004cce08dc048d47c82bc9fdd0f4191
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.7 b/metadata/md5-cache/dev-ros/rosparam-1.15.7
index 7a19e9622900..15587671e35a 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe77ea695b8f1ed937f5b4af75b1d9a5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.15.8 b/metadata/md5-cache/dev-ros/rosparam-1.15.8
new file mode 100644
index 000000000000..bb83dafe9f20
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosparam-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rosparam-9999 b/metadata/md5-cache/dev-ros/rosparam-9999
index 126e375adfa6..4752ff77332c 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosparam https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe77ea695b8f1ed937f5b4af75b1d9a5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=26e161c00f1ede8e67a4d163fa9aa089
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.7 b/metadata/md5-cache/dev-ros/rospy-1.15.7
index 58e1079ae382..66e2af45023d 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.15.7
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58bb0f35e7ecb714cb51407b5f04b003
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-1.15.8 b/metadata/md5-cache/dev-ros/rospy-1.15.8
new file mode 100644
index 000000000000..abb3b5b18b38
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rospy-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DESCRIPTION=Python client library for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c7b9475a6d2b8c752eaa03ca398f7cc
diff --git a/metadata/md5-cache/dev-ros/rospy-9999 b/metadata/md5-cache/dev-ros/rospy-9999
index 36909ba9a3a9..2f6d2a124f00 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rospy https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roscpp[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=58bb0f35e7ecb714cb51407b5f04b003
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 40d3d7dded83..92a0f6326aab 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.10.1.tar.gz -> ros_tutorials-0.10.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2042c8fa6729d0d528567de6b8cefc75
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6052668bfe1f9dbbb66f6a3ae5ff877
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-9999 b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
index cfb3eb6cdfc3..602f7f3a5a84 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2042c8fa6729d0d528567de6b8cefc75
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d6052668bfe1f9dbbb66f6a3ae5ff877
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 6465adeabdc5..156668ce4ec5 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11d24521e9a94bfce06bd4d543e58a6b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=01f5d2e059145dbd4b8d5499257803a6
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-9999 b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
index b584555825fc..ccda0ccaf339 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=11d24521e9a94bfce06bd4d543e58a6b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 fc1b66648d50..0f6dbb35e5b9 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f3532507f513e0d28a1c4459abbdc00
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8b4d212504387ee1f1a43dcd1d19b12b
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-9999 b/metadata/md5-cache/dev-ros/rosserial_client-9999
index 6c4b1a637884..d7eeb5ce9a2a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_client-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_client https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f3532507f513e0d28a1c4459abbdc00
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 b0e40cfc7e43..2d6582bff97a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23fdb8d42fb0ec7caa7dc44aa84edab2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b29350ec3aa158b69276ec88ac695ed5
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
index 6bc0efbd10fa..00029f347df7 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=23fdb8d42fb0ec7caa7dc44aa84edab2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 2c2a8d4c5b58..eaeb3c2f32d6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0b9bd5c0e8043ab57691a0967eae88cd
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-9999 b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
index 78f0a3912848..25f3507d687e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_msgs https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 9589986baa0e..aa9b1d1d1f3f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=342f107ea5f779746a599069bd324631
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-9999 b/metadata/md5-cache/dev-ros/rosserial_python-9999
index 93f0c158ed4b..204428950588 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=342f107ea5f779746a599069bd324631
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff762244924b198b89504337dd9f31d1
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0 b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
index 621ab0a5d20f..c0a3562c100a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5861d4f7fe56da0b0f0cafc6ebd7091b
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-9999 b/metadata/md5-cache/dev-ros/rosserial_server-9999
index e7b7f9e1e1d9..c944997df7f8 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] dev-ros/rosserial_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosserial_server https://github.com/ros-drivers/rosserial
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/topic_tools dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=5861d4f7fe56da0b0f0cafc6ebd7091b
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 4a69e3344ac3..2bf5c00d6b1f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a925a3630d89323c603bad235241268b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=243f73748f717611e78b9a861e0eb9b8
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-9999 b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
index 738ee7b63112..c88d2471329c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosserial_client[python_single_target_python3_7(-)?] dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a925a3630d89323c603bad235241268b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 10e557bcd9b5..b2a7a9ab7e19 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea6550528bc6c37de0418f43908c1a22
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0dc0b18363be2339ae14a86ae36b428a
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-9999 b/metadata/md5-cache/dev-ros/rosserial_windows-9999
index b5ed4a44f823..083a9a6d2bc2 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_client[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosserial_client[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ea6550528bc6c37de0418f43908c1a22
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 c60422593f25..48abb93fc5fe 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.8.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.8.0.tar.gz -> rosserial-0.8.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7823e5f9cbbad3abd8db14daa6df1e2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-9999 b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
index 9101010f9865..bb8dc27e0440 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyserial[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosserial_python[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyserial[python_targets_python3_7(-)] ) dev-ros/rosserial_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosserial_python[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7823e5f9cbbad3abd8db14daa6df1e2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1577863352a25b6cd0312f24233cd75
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.7 b/metadata/md5-cache/dev-ros/rosservice-1.15.7
index c178714549f1..e450bd38a9fc 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.15.7
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7382937efa7303ed97f81fdb138a1630
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.15.8 b/metadata/md5-cache/dev-ros/rosservice-1.15.8
new file mode 100644
index 000000000000..f63f441c3e2f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosservice-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Command-line tool for listing and querying ROS Services
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rosservice-9999 b/metadata/md5-cache/dev-ros/rosservice-9999
index 3c2a6312b37b..2158f1253053 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosservice https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7382937efa7303ed97f81fdb138a1630
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a223748f45a180da9eea2962fdb8b2bf
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.7 b/metadata/md5-cache/dev-ros/rostest-1.15.7
index 11843b970b10..c3a90ac01e4c 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.15.7
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2abbe41a916fbd5a66ceafa25b01c90b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9c54c689ebd0fb27a5df8aebcff80bf
diff --git a/metadata/md5-cache/dev-ros/rostest-1.15.8 b/metadata/md5-cache/dev-ros/rostest-1.15.8
new file mode 100644
index 000000000000..6bb8484b127b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostest-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9c54c689ebd0fb27a5df8aebcff80bf
diff --git a/metadata/md5-cache/dev-ros/rostest-9999 b/metadata/md5-cache/dev-ros/rostest-9999
index 2c28725ff8e6..174713178051 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-ros/rostopic ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Integration test suite based on roslaunch compatible with xUnit frameworks
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostest https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosunit[python_single_target_python3_7(-)?] dev-libs/boost:=[threads] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rosmaster[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2abbe41a916fbd5a66ceafa25b01c90b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9c54c689ebd0fb27a5df8aebcff80bf
diff --git a/metadata/md5-cache/dev-ros/rostime-0.7.2 b/metadata/md5-cache/dev-ros/rostime-0.7.2
index da0fb4198f29..4cc51b54f6b1 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.7.2
+++ b/metadata/md5-cache/dev-ros/rostime-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostime https://github.com/ros/roscpp_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb75d86a8d373f1c0239715407a047fa
diff --git a/metadata/md5-cache/dev-ros/rostime-9999 b/metadata/md5-cache/dev-ros/rostime-9999
index b6afa36e3875..787b182618e8 100644
--- a/metadata/md5-cache/dev-ros/rostime-9999
+++ b/metadata/md5-cache/dev-ros/rostime-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostime https://github.com/ros/roscpp_core
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fb75d86a8d373f1c0239715407a047fa
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.7 b/metadata/md5-cache/dev-ros/rostopic-1.15.7
index 4cf2ce7ac37e..72a07c09795d 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.15.7
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=730401768c3111e4ac0f32619f3b5a69
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c918b6a31b9d0e7910808bf24a2baf0
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.15.8 b/metadata/md5-cache/dev-ros/rostopic-1.15.8
new file mode 100644
index 000000000000..6734bfdab717
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rostopic-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c918b6a31b9d0e7910808bf24a2baf0
diff --git a/metadata/md5-cache/dev-ros/rostopic-9999 b/metadata/md5-cache/dev-ros/rostopic-9999
index 3af7684b8195..3d2b4d3ae56b 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rostopic https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=730401768c3111e4ac0f32619f3b5a69
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2c918b6a31b9d0e7910808bf24a2baf0
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.5 b/metadata/md5-cache/dev-ros/rosunit-1.15.5
index 03fe9065caa5..334c896f6b7f 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.15.5
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.15.5.tar.gz -> ros-1.15.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ce3b28e7972dd360304a87d98f7e6c1
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.15.6 b/metadata/md5-cache/dev-ros/rosunit-1.15.6
new file mode 100644
index 000000000000..346946594de6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rosunit-1.15.6
@@ -0,0 +1,16 @@
+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(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Unit-testing package for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros/archive/1.15.6.tar.gz -> ros-1.15.6.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/rosunit-9999 b/metadata/md5-cache/dev-ros/rosunit-9999
index 72563e5b629e..0b14a9caac4c 100644
--- a/metadata/md5-cache/dev-ros/rosunit-9999
+++ b/metadata/md5-cache/dev-ros/rosunit-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit-testing package for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rosunit https://github.com/ros/ros
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3ce3b28e7972dd360304a87d98f7e6c1
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c02a417bea734387509412c88f623792
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.7 b/metadata/md5-cache/dev-ros/roswtf-1.15.7
deleted file mode 100644
index 0f75ee6c2641..000000000000
--- a/metadata/md5-cache/dev-ros/roswtf-1.15.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tool for diagnosing issues with a running ROS system
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bb3ba67066821fe340f709588c4fcba
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.15.8 b/metadata/md5-cache/dev-ros/roswtf-1.15.8
new file mode 100644
index 000000000000..063d1c6252e7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/roswtf-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=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(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Tool for diagnosing issues with a running ROS system
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=24ae2b1e3af172ce33c89bae39fdca20
diff --git a/metadata/md5-cache/dev-ros/roswtf-9999 b/metadata/md5-cache/dev-ros/roswtf-9999
index c30de7024580..e3239b0ebfce 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosdep[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/rosinstall[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-util/rosdep[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/roswtf https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/paramiko[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/paramiko[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5bb3ba67066821fe340f709588c4fcba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=24ae2b1e3af172ce33c89bae39fdca20
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 026d96b96d12..6185d54d1955 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= dev-ros/cmake_modules python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/angles dev-ros/base_local_planner dev-ros/costmap_2d dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-ros/nav_core-1.16 dev-ros/pluginlib dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_ros dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index f65e70110c7e..ab8fd449f5a5 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Recovery behavior that attempts performing a 360 degree rotation of the robot
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rotate_recovery https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6abb5d12d5fbfcd5a10a1c0f88254f8b
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.9 b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
index 28a5b892b8ec..66b9d53a244b 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_action/archive/0.4.9.tar.gz -> rqt_action-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c691ba41ce402769e3925b7bf8cbcba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03ac5926db66a3c233cb044ccad4946c
diff --git a/metadata/md5-cache/dev-ros/rqt_action-9999 b/metadata/md5-cache/dev-ros/rqt_action-9999
index 4d77f5abed08..69bed88be3e1 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2c691ba41ce402769e3925b7bf8cbcba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03ac5926db66a3c233cb044ccad4946c
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
index 223cb79999f7..c8d5044f5961 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bf35a7ad2f6ece5b61a6fb45d8771fe
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-9999 b/metadata/md5-cache/dev-ros/rqt_bag-9999
index 6cf351e4b415..f7c9d2ff674b 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_bag https://github.com/ros-visualization/rqt_bag
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1bf35a7ad2f6ece5b61a6fb45d8771fe
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=56be5be194b74b297c61f0d84be69fc2
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
index 40df1427b045..b0a949384040 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_bag/archive/0.4.13.tar.gz -> rqt_bag-0.4.13.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=777df0a43465476ebc88fd8fef8e3933
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 9a4491bdbb4c..df9667fcdcaf 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pycairo[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] ) dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=777df0a43465476ebc88fd8fef8e3933
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 416f47cc2d99..b1a33c1a2c92 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.11
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_console/archive/0.4.11.tar.gz -> rqt_console-0.4.11.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ed14cc808fb0afd69af338c987d3b4b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=364b5d1158f5632babd0cebe1663f1e8
diff --git a/metadata/md5-cache/dev-ros/rqt_console-9999 b/metadata/md5-cache/dev-ros/rqt_console-9999
index 6b9d831da175..ac2c0f8887ea 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_logger_level[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_logger_level[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ed14cc808fb0afd69af338c987d3b4b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 5e7250007c64..1aad9a4eee1e 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a18dfd110daa85a8a49354546ef3e533
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2b03b2093c3461ee6ef092f5815074db
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999 b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
index 217cf71acd1b..444f0451a114 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=RQT control manager plugin
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_controller_manager https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/controller_manager[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/controller_manager[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a18dfd110daa85a8a49354546ef3e533
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 ce408139a983..dc6cf126ed1d 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_dep/archive/0.4.10.tar.gz -> rqt_dep-0.4.10.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4985eede60527124834dc0d1998dfac7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=43d3393d194539070b12dff2f3e501f7
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-9999 b/metadata/md5-cache/dev-ros/rqt_dep-9999
index 8e39d84f2acf..6563a9253bfa 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_dep https://github.com/ros-visualization/rqt_dep
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4985eede60527124834dc0d1998dfac7
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=43d3393d194539070b12dff2f3e501f7
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 084e638a42e7..54b9959fcccf 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_graph/archive/0.4.14.tar.gz -> rqt_graph-0.4.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21713533a099e2abd1628213c4676351
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=08e33af7fbb2839e08c857e92f5488a3
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-9999 b/metadata/md5-cache/dev-ros/rqt_graph-9999
index dd98f6ed05d6..480f74e307d5 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rosgraph_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21713533a099e2abd1628213c4676351
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 00806de527a8..0377d9bbaad4 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.5.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0539f1a6330b3818e92da3ac8f75ff9
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4154236a271b8032e520ed3ae15f20d6
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-9999 b/metadata/md5-cache/dev-ros/rqt_gui-9999
index 708b5b50be45..26fc34511c4f 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=>=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a0539f1a6330b3818e92da3ac8f75ff9
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 86a45a534cd4..44a05de28e26 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/qt_gui-0.3.0 dev-ros/roscpp dev-ros/nodelet dev-libs/tinyxml2:= dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c6fd3fc039eead4d96d25c2ba55e309d
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
index fa5bd5e34b9e..5afc56bca00b 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_cpp https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5a7587fab7cc..fcfbf59029e2 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f27c927a1e639318b53a399741f519ac
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 14881fee9e69..64e58afd805d 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_gui_py https://github.com/ros-visualization/rqt
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] >=dev-ros/qt_gui-0.3.0[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui-0.3.0[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f27c927a1e639318b53a399741f519ac
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=07bb753f9d503907082eda3a1e95b5a9
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
index db58a8c6f2db..9dac692f9216 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_image_view/archive/0.4.15.tar.gz -> rqt_image_view-0.4.15.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e6c165c613c44f76f97003513372a10
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 f12993c11304..bbecd218d6a0 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-qt/qtwidgets:5 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cv_bridge[python_single_target_python3_7(-)?] media-libs/opencv:= dev-ros/image_transport dev-ros/rqt_gui[python_single_target_python3_7(-)?] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e6c165c613c44f76f97003513372a10
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e1210d84a04b5573c35a9a8220aef47
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
index 436a490fd970..8ec1f262a2d9 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Easy view of .launch files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_launch/archive/0.4.8.tar.gz -> rqt_launch-0.4.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4197bba654ab36793f1fd8051fd8fb83
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=efc22c56f04960580f0bce126eeb3b60
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-9999 b/metadata/md5-cache/dev-ros/rqt_launch-9999
index fb9c2d90c38e..02185f401737 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Easy view of .launch files
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_launch https://github.com/ros-visualization/rqt_launch
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4197bba654ab36793f1fd8051fd8fb83
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 5e7371fe825b..2d056959532e 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_logger_level/archive/0.4.11.tar.gz -> rqt_logger_level-0.4.11.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84dfcfc3d20a92480a7262ad3c18e92c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 656c17b031a0..e096b476faf6 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=84dfcfc3d20a92480a7262ad3c18e92c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 6c59be55d403..f152f54bd1b0 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_moveit/archive/0.5.9.tar.gz -> rqt_moveit-0.5.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db3aa7239e03162673daa3668ae8e03e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95ef5531ef01ba95369c25cee54e12cb
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-9999 b/metadata/md5-cache/dev-ros/rqt_moveit-9999
index 8644e8eb83b6..8a0ee9c2b469 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_moveit https://github.com/ros-visualization/rqt_moveit
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosnode[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_topic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosnode[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_topic[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db3aa7239e03162673daa3668ae8e03e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 c1a8f98b8383..7bf73d3f1cde 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_msg/archive/0.4.9.tar.gz -> rqt_msg-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87f715634d4cf02f5ef1f902abcb458f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=696f9747a699226d1aa78179a2493721
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-9999 b/metadata/md5-cache/dev-ros/rqt_msg-9999
index 393cc3df637b..1c854a8e04fa 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87f715634d4cf02f5ef1f902abcb458f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 1defebdd255a..cded1ac8e233 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_nav_view/archive/0.5.7.tar.gz -> rqt_nav_view-0.5.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9cad447bfa3bec52ff957914b58c4606
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 13a9e7cc993e..ad36ebdacf57 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9cad447bfa3bec52ff957914b58c4606
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f45f1ccc29b7a1cf785e711fb5562d81
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.12 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
index 598d0d6ef8e4..40189ac69ead 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_plot/archive/0.4.12.tar.gz -> rqt_plot-0.4.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1eb98489f74cd37b3aee0a30e47d59c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=76f32f03eefdff59fbbf4f1145c35ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-9999 b/metadata/md5-cache/dev-ros/rqt_plot-9999
index de7e7d302620..d035c582c154 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/matplotlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyqtgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/matplotlib[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/pyqtgraph[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a1eb98489f74cd37b3aee0a30e47d59c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 86b3a2f811b3..e3d4cf6bcbe6 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_pose_view/archive/0.5.10.tar.gz -> rqt_pose_view-0.5.10.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89150bd5e3dfb08fce84067c1ee4c3cc
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 03e5e716e4bd..7662f324ff41 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyopengl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyopengl[python_targets_python3_7(-)] ) dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=89150bd5e3dfb08fce84067c1ee4c3cc
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 dd29d9059cc6..d9bcb7bcb49b 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_publisher/archive/0.4.9.tar.gz -> rqt_publisher-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f8a100c13d8a1ce43da6928cdbcad01
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ca4ae103b03a0a221e70e7c921c27e0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-9999 b/metadata/md5-cache/dev-ros/rqt_publisher-9999
index 1eb5292d04fc..c1032c43fb4b 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f8a100c13d8a1ce43da6928cdbcad01
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 edde59c0c2b8..9e834169f6ea 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.5.2.tar.gz -> rqt-0.5.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2b81822be2ff0b00699100084a4cd3a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31cf2dbc559b53cd0917879f9649bea9
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-9999 b/metadata/md5-cache/dev-ros/rqt_py_common-9999
index e909d89b899d..fef45c1cc65b 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b2b81822be2ff0b00699100084a4cd3a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=31cf2dbc559b53cd0917879f9649bea9
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 8737f690b4db..2778d9b2527b 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_py_console/archive/0.4.9.tar.gz -> rqt_py_console-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3394d2c96b39b4dea4c4d8b0c42ca81
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 e8721e640c1c..d5ed66f31522 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c3394d2c96b39b4dea4c4d8b0c42ca81
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=753094002b8406055cdb156e0f51cecf
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
index 22174852dba0..b67ab101be39 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.5.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_reconfigure/archive/0.5.3.tar.gz -> rqt_reconfigure-0.5.3.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67a9b40addf8b56beb2aeb9f8d936376
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69014b35d5eb7410d23d0d13f7e688b1
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999 b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
index 85694af92404..38fffc499cb3 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Provides the way to view and edit the parameters from dynamic_reconfigure
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_reconfigure https://github.com/ros-visualization/rqt_reconfigure
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=67a9b40addf8b56beb2aeb9f8d936376
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=69014b35d5eb7410d23d0d13f7e688b1
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 945d2b274ef2..5fe81d3bddca 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_nav_view[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_robot_monitor[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_nav_view[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_robot_monitor[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_dashboard/archive/0.5.8.tar.gz -> rqt_robot_dashboard-0.5.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35ab59b4a13bea24652bb09336c70dbb
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 92bb1e026647..0faaee95dfb6 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_nav_view[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_robot_monitor[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_console[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_nav_view[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_robot_monitor[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_console[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_nav_view[python_single_target_python3_7(-)?] dev-ros/rqt_robot_monitor[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=35ab59b4a13bea24652bb09336c70dbb
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=13c2b74d4fb1d0d9bfd2c94770622ad4
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
index 6a7a7a1851fa..3d87bc059605 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_monitor/archive/0.5.12.tar.gz -> rqt_robot_monitor-0.5.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=757183041ef9626c9ab0f1994cb4ffad
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 369d0a60b28d..be04ea7d7abc 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/python_qt_binding[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_bag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/python_qt_binding[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_bag[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=757183041ef9626c9ab0f1994cb4ffad
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=959de8cb5b8de2f5820c9e8f2315c59c
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
index 2530985aae58..c83adda791d0 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.11
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_steering/archive/0.5.11.tar.gz -> rqt_robot_steering-0.5.11.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7217eadfb2f8ed894662876daa269369
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=96d222cb0d47f69b7ccb351cdffcab76
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999 b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
index d86207b61cae..dc5d501724b9 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7217eadfb2f8ed894662876daa269369
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 2de133eb6ecf..b7f4d6dcf19d 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_runtime_monitor/archive/0.5.8.tar.gz -> rqt_runtime_monitor-0.5.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c3a8f5a25a775dfd640f9688f49eb76
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 bdbacf981c7f..85e2a26263a5 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_runtime_monitor https://github.com/ros-visualization/rqt_runtime_monitor
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c3a8f5a25a775dfd640f9688f49eb76
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 6f9eb2fdbdb4..1b4af1b61d19 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.6.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7f1107371cc0d646829383eebb6d9c2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35a2aa9428c930af81ee79dc142cccfd
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-9999 b/metadata/md5-cache/dev-ros/rqt_rviz-9999
index 0ca835bb0e4a..dab7182a706e 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-9999
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_rviz https://github.com/ros-visualization/rqt_rviz
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] 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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7f1107371cc0d646829383eebb6d9c2
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 baef81b03029..333938213c1d 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_service_caller/archive/0.4.9.tar.gz -> rqt_service_caller-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44255cc67c2d7934971c6fff041b3397
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 8bc37a258046..01774cf40bad 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-9999
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosservice[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rosservice[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_py_common[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=44255cc67c2d7934971c6fff041b3397
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 e0018f5fb4ec..0a4e48787410 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.10
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_shell/archive/0.4.10.tar.gz -> rqt_shell-0.4.10.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe0ed1630978ae6624e1eb8aa70b3499
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=269d72ae6ef97884c12bed51157b84f1
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-9999 b/metadata/md5-cache/dev-ros/rqt_shell-9999
index 5f2d06264eab..8099a1077fcd 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-9999
+++ b/metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_shell https://github.com/ros-visualization/rqt_shell
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui_py_common[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_gui[python_single_target_python3_7(-)?] dev-ros/qt_gui_py_common[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe0ed1630978ae6624e1eb8aa70b3499
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 08080fb8b7c8..7a00c2833a61 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_srv/archive/0.4.8.tar.gz -> rqt_srv-0.4.8.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=413869f481895649b5794464756ba5b4
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-9999 b/metadata/md5-cache/dev-ros/rqt_srv-9999
index 7800b4468bad..49fb08329b3c 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-9999
+++ b/metadata/md5-cache/dev-ros/rqt_srv-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_msg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosmsg[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/rqt_msg[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=413869f481895649b5794464756ba5b4
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b04275dd5b5283b32d2f88e3d7957294
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
index e7511680be67..cb209b24d64b 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.6.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_tf_tree/archive/0.6.1.tar.gz -> rqt_tf_tree-0.6.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5aea957a736d7fc061b4126b39c53cf5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 4aef73da4a32..474947bb6095 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/mock[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_dotgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_graph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/qt_dotgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_graph[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5aea957a736d7fc061b4126b39c53cf5
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 43ab88a018d8..6340340f7a2d 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_top/archive/0.4.9.tar.gz -> rqt_top-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42417d9968023a05e7ddd2a8ed22db0e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4c93ed0908343f114500103c996d8235
diff --git a/metadata/md5-cache/dev-ros/rqt_top-9999 b/metadata/md5-cache/dev-ros/rqt_top-9999
index 620758db0e19..3ce9714857de 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-9999
+++ b/metadata/md5-cache/dev-ros/rqt_top-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_top https://github.com/ros-visualization/rqt_top
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/psutil[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/psutil[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42417d9968023a05e7ddd2a8ed22db0e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 39aac277e685..773e5b0a1075 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_topic/archive/0.4.12.tar.gz -> rqt_topic-0.4.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c112434a4f56bba36bf0257fb61e0bd3
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e355a9cc639c6d03feb11f96b86cd724
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-9999 b/metadata/md5-cache/dev-ros/rqt_topic-9999
index 679158f3287e..f890cf5ab9de 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-9999
+++ b/metadata/md5-cache/dev-ros/rqt_topic-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] >=dev-ros/python_qt_binding-0.2.19[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c112434a4f56bba36bf0257fb61e0bd3
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 ec898fc9ee5c..492bf036e2cf 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.9
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.9
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_web/archive/0.4.9.tar.gz -> rqt_web-0.4.9.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56c243c21387f1ced918cbd45174c96b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rqt_web-9999 b/metadata/md5-cache/dev-ros/rqt_web-9999
index 8220964d1af6..610993416143 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-9999
+++ b/metadata/md5-cache/dev-ros/rqt_web-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rqt_web https://github.com/ros-visualization/rqt_web
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rqt_gui_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/qt_gui[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rqt_gui[python_single_target_python3_7(-)?] dev-ros/rqt_gui_py[python_single_target_python3_7(-)?] dev-ros/qt_gui[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56c243c21387f1ced918cbd45174c96b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=50c2cdbdc2a3e609194674eb0cdabec4
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.1 b/metadata/md5-cache/dev-ros/rviz-1.14.1
index 9e1a90549474..79a3e44f5e9e 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.14.1
+++ b/metadata/md5-cache/dev-ros/rviz-1.14.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-ros/cmake_modules virtual/pkgconfig sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.1.tar.gz -> rviz-1.14.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b341a7fdbedb155820a5b311fb4c78b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4042f68c8b1e376e09ed104a74bc0f51
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index ffd8238b3b72..e174feb09be9 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -1,15 +1,15 @@
 BDEPEND=dev-ros/cmake_modules virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/resource_retriever dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/nav_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b341a7fdbedb155820a5b311fb4c78b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 f15151656662..cacd85623d67 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=RVIZ plugin for IMU visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccny-ros-pkg/imu_tools/archive/1.2.2.tar.gz -> imu_tools-1.2.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 706b918b9133..41b99eab4d1f 100644
--- a/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
+++ b/metadata/md5-cache/dev-ros/rviz_imu_plugin-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=RVIZ plugin for IMU visualization
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz_imu_plugin https://github.com/ccny-ros-pkg/imu_tools
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 12e319264a55..5914917ef8b5 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b43a2582b16c..d4e2712a927e 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e9ca76a09443..6ebb38509d1c 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rviz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/rviz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12159d39725ddc0142502568db2057ec
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 f53017bc612b..f45126b86b35 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rviz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rviz[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rviz[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12159d39725ddc0142502568db2057ec
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=61f21fef4ea62f70c698acd388806c40
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 f1e8c0aa8169..ad9b9c31f800 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.9.4
+++ b/metadata/md5-cache/dev-ros/self_test-1.9.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f36f9bbf77527ddec7cdc45d8790e5c
diff --git a/metadata/md5-cache/dev-ros/self_test-9999 b/metadata/md5-cache/dev-ros/self_test-9999
index aaaee501588a..777a05353a52 100644
--- a/metadata/md5-cache/dev-ros/self_test-9999
+++ b/metadata/md5-cache/dev-ros/self_test-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Robot self-test node
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/self_test https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f36f9bbf77527ddec7cdc45d8790e5c
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 28c50fa95669..bb29fc53e9b6 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e9faee46136cdf32247c44478d3e4e8
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eb569c38e9a80935bdce93993514b438
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-9999 b/metadata/md5-cache/dev-ros/sensor_msgs-9999
index 2753e5e5d44f..21595b635ddb 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-cpp/gtest dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for commonly used sensors: cameras and scanning laser rangefinders
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/sensor_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e9faee46136cdf32247c44478d3e4e8
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 0504a42e3804..7fa432d85372 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-0.10.14
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=11d434e4a3edeb27b70f74af6c131c89
diff --git a/metadata/md5-cache/dev-ros/settlerlib-9999 b/metadata/md5-cache/dev-ros/settlerlib-9999
index c1464e54e202..7c2bda04424d 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-9999
+++ b/metadata/md5-cache/dev-ros/settlerlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime dev-ros/calibration_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/rosconsole dev-ros/rostime python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f5d529816fad..30e48af4d3b1 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b44e669f2aeeded957191d45aadcfee1
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-9999 b/metadata/md5-cache/dev-ros/shape_msgs-9999
index 2f87cbdffdc8..646182e82f2e 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for defining shapes: simple solid object primitives, planes, and meshes
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/shape_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 42f47cd85c7c..1d1ab63632e0 100644
--- a/metadata/md5-cache/dev-ros/smach-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach https://github.com/ros/executive_smach
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=711e08053ee160d9fdb0ae1701db5597
diff --git a/metadata/md5-cache/dev-ros/smach-9999 b/metadata/md5-cache/dev-ros/smach-9999
index 0e26998095eb..d5ac35fb611d 100644
--- a/metadata/md5-cache/dev-ros/smach-9999
+++ b/metadata/md5-cache/dev-ros/smach-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/smach https://github.com/ros/executive_smach
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e8eaa68bdcad..35bd943b211f 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_msgs-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e30ccac70cea974d168c81de129832c
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-9999 b/metadata/md5-cache/dev-ros/smach_msgs-9999
index 057408b72ca1..69a065fd4ca1 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-9999
+++ b/metadata/md5-cache/dev-ros/smach_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b92ad2acccae..39f3f1fabd0b 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.5.0
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.5.0.tar.gz -> executive_smach-2.5.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96208e6502855bf5fa3c131067ae0c5b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fa799ff618789abe2cfa5043170db15
diff --git a/metadata/md5-cache/dev-ros/smach_ros-9999 b/metadata/md5-cache/dev-ros/smach_ros-9999
index b963541f43c7..58ea5be015e1 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-9999
+++ b/metadata/md5-cache/dev-ros/smach_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostopic[python_single_target_python3_7(-)?] dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/smach[python_single_target_python3_7(-)?] dev-ros/std_srvs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/smach_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=96208e6502855bf5fa3c131067ae0c5b
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4fa799ff618789abe2cfa5043170db15
diff --git a/metadata/md5-cache/dev-ros/smclib-1.8.5 b/metadata/md5-cache/dev-ros/smclib-1.8.5
index 40306d5a5813..e086b25629c2 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.8.5
+++ b/metadata/md5-cache/dev-ros/smclib-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.8.5.tar.gz -> bond_core-1.8.5.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=887fb68742590c83aea0c297454be317
diff --git a/metadata/md5-cache/dev-ros/smclib-9999 b/metadata/md5-cache/dev-ros/smclib-9999
index 33bac0f49ef3..140ba2e9696e 100644
--- a/metadata/md5-cache/dev-ros/smclib-9999
+++ b/metadata/md5-cache/dev-ros/smclib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f47babecdbd6..82df683c5d67 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.8.0
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.8.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbaf8d7621b7a78a591391356810f2f5
diff --git a/metadata/md5-cache/dev-ros/stage_ros-9999 b/metadata/md5-cache/dev-ros/stage_ros-9999
index 82e72ba91adb..4287aaccba78 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 6774bc24a2a1..32173e61b408 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Standard ROS Messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f216de12e8cf869eb9480f4bffcb9997
diff --git a/metadata/md5-cache/dev-ros/std_msgs-9999 b/metadata/md5-cache/dev-ros/std_msgs-9999
index 7f7bec19b97d..508ff1c34a96 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-9999
+++ b/metadata/md5-cache/dev-ros/std_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Standard ROS Messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_msgs https://github.com/ros/std_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 71f277be1f5c..1ce1416999fc 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.3
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_srvs https://github.com/ros/ros_comm_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2dde0c47eceaa51210d10fce577171e5
diff --git a/metadata/md5-cache/dev-ros/std_srvs-9999 b/metadata/md5-cache/dev-ros/std_srvs-9999
index b0c271d200ac..e8d63176b96e 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-9999
+++ b/metadata/md5-cache/dev-ros/std_srvs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/std_srvs https://github.com/ros/ros_comm_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 60d8b52d4ccd..2e5a854cd2f3 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.15.2.tar.gz -> image_pipeline-1.15.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=52de8406f3d02fb7c1a5a97d9ed37038
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-9999 b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
index 521d4fd2e410..fd3c70ad8bbc 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet media-libs/opencv:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 8307377600e2..80d5b8e06b67 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3d4ddbd19e2db907af8e7dcd62efd814
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-9999 b/metadata/md5-cache/dev-ros/stereo_msgs-9999
index d745e835c305..c7c161c5bbb5 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/stereo_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3362440ab271..71e26e76ada2 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.8.5
+++ b/metadata/md5-cache/dev-ros/test_bond-1.8.5
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=356c92dea781009287ddf8a601559992
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8aa6ebfc13f57c4787cfa1348711a458
diff --git a/metadata/md5-cache/dev-ros/test_bond-9999 b/metadata/md5-cache/dev-ros/test_bond-9999
index a08ff54a4208..2b11819d325f 100644
--- a/metadata/md5-cache/dev-ros/test_bond-9999
+++ b/metadata/md5-cache/dev-ros/test_bond-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_bond https://github.com/ros/bond_core
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=356c92dea781009287ddf8a601559992
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8aa6ebfc13f57c4787cfa1348711a458
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 3150327e6445..ed3b4786f76a 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62fd59b2b4bb1afe2a76c86ad1c05a7
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
index 33d70135c309..5aa9c78f38bb 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_diagnostic_aggregator https://github.com/ros/diagnostics
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=c62fd59b2b4bb1afe2a76c86ad1c05a7
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 29bec9d0ed70..4df5e2086052 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.10.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec771d98d5b1092b355f85e4fd54b7df
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-9999 b/metadata/md5-cache/dev-ros/test_nodelet-9999
index 6e92bde90b4a..8f2ee666fe3e 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Nodelet unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet https://github.com/ros/nodelet_core
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=ec771d98d5b1092b355f85e4fd54b7df
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 b52a80ffae4f..87bb0bb8f2fa 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0659e18ddcc0f47e3f5209835237b54
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 79cae99eb5ba..e30687a51d5f 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_nodelet_topic_tools https://github.com/ros/nodelet_core
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d0659e18ddcc0f47e3f5209835237b54
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.7 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.7
index b2c8703b0bf8..301ff6b109a5 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] 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(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22c208b9f34911ec50013e5e6a04b6fb
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca7c812935e34e8f061b00a4cc3b1398
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.15.8 b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
new file mode 100644
index 000000000000..14cd918a1698
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.15.8
@@ -0,0 +1,16 @@
+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(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] 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(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DESCRIPTION=Unit tests for rosbag
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca7c812935e34e8f061b00a4cc3b1398
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-9999 b/metadata/md5-cache/dev-ros/test_rosbag-9999
index 737fef9ec13c..64900d05e4bb 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] 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(-)] ) dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/topic_tools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/xmlrpcpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_single_target_python3_7(-)?] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-ros/topic_tools[python_single_target_python3_7(-)?] dev-ros/xmlrpcpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=22c208b9f34911ec50013e5e6a04b6fb
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca7c812935e34e8f061b00a4cc3b1398
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
index c8d2ce99f978..696209554c00 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0af2801fcc7f9a908b68b2ca52127fff
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
new file mode 100644
index 000000000000..da5c15ad8eb3
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Unit tests for rosbag_storage
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0af2801fcc7f9a908b68b2ca52127fff
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index 3d4c943bafde..93b983ae34a1 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosbag_storage https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0af2801fcc7f9a908b68b2ca52127fff
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 db3b2548ed93..cc1ac3e56ba1 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81229a582c1a3d33680ae52cea68377e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..1eccb520e4eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.15.8
@@ -0,0 +1,16 @@
+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(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DESCRIPTION=Unit tests for roscpp
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c7cb71ac18b5c95cf474d36238ded25
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-9999 b/metadata/md5-cache/dev-ros/test_roscpp-9999
index 65f35bbdd50c..ab7f8c819c8b 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roscpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=test? ( ros_messages_cxx ) || ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=test? ( ros_messages_cxx ) ^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=81229a582c1a3d33680ae52cea68377e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=3c7cb71ac18b5c95cf474d36238ded25
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 75b6c3c8d447..2bcb416c6345 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f74d5dbdbc4137fea960529d46aa3773
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..4e55cfff6325
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Unit tests for rosgraph
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea8bbdfaa8fceb0d25bd3511ee272bad
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-9999 b/metadata/md5-cache/dev-ros/test_rosgraph-9999
index 6f9f7de1aa58..61ee88f3d3c8 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/rosgraph[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for rosgraph
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosgraph https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f74d5dbdbc4137fea960529d46aa3773
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea8bbdfaa8fceb0d25bd3511ee272bad
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7
index 19766ba90cc9..d85e83e085d7 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92d21d5ca405ebd473505439bbcefa2a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0f07d0ae6afe585c4f5ef6642459879
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8 b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
new file mode 100644
index 000000000000..01fa5e3bb9a5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=Unit tests for roslaunch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0f07d0ae6afe585c4f5ef6642459879
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-9999 b/metadata/md5-cache/dev-ros/test_roslaunch-9999
index deadaaf0ac22..101797deb7aa 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Unit tests for roslaunch
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslaunch https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=92d21d5ca405ebd473505439bbcefa2a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e0f07d0ae6afe585c4f5ef6642459879
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7
index 354104c5776b..a5d2f6013925 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac74310843fd74845adb473b9a31ca88
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af9c54dc06e68283b75b51a8ee3ee8d3
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
new file mode 100644
index 000000000000..f3bfbe622568
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.15.8
@@ -0,0 +1,16 @@
+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_7? ( dev-python/nose[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DESCRIPTION=Unit tests for roslib
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af9c54dc06e68283b75b51a8ee3ee8d3
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-9999 b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
index c7800d603e22..a693df393682 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for roslib
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_roslib_comm https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/rosgraph_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/rosgraph_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/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(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac74310843fd74845adb473b9a31ca88
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af9c54dc06e68283b75b51a8ee3ee8d3
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7
index 99fc2172f0da..8ae7ec0b2c8b 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6e2be995eb29be8d7ff6860a11f2623
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c40d6cafa6dcc0ab45dc29132a4a94a
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8 b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
new file mode 100644
index 000000000000..1d0089a0eb39
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DESCRIPTION=Unit tests for rosmaster
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c40d6cafa6dcc0ab45dc29132a4a94a
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-9999 b/metadata/md5-cache/dev-ros/test_rosmaster-9999
index 6a159512128f..719fb9fd2126 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] test? ( dev-ros/roslib[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosmaster https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a6e2be995eb29be8d7ff6860a11f2623
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0c40d6cafa6dcc0ab45dc29132a4a94a
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 3992aa7fc1b7..30b52252f4e0 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12bdbf4023e29ca505e943874e60ac6c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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
new file mode 100644
index 000000000000..3cf90bfc14b4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
+DESCRIPTION=Unit tests for rosparam
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a915e73918dc0b1e6532bf58379010b9
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-9999 b/metadata/md5-cache/dev-ros/test_rosparam-9999
index 18c382ffd8d8..1f465e3bc3d0 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosparam[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) dev-ros/rosparam[python_single_target_python3_7(-)?] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=Unit tests for rosparam
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosparam https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=12bdbf4023e29ca505e943874e60ac6c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a915e73918dc0b1e6532bf58379010b9
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.7 b/metadata/md5-cache/dev-ros/test_rospy-1.15.7
index 860fbf7b465d..e5d9d1f991cb 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d80f0a302cecdf7bb27f8f7d85c747c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=343ef308ff97f5697647c0ec5f428fc4
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.15.8 b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
new file mode 100644
index 000000000000..1c930d7d2725
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=343ef308ff97f5697647c0ec5f428fc4
diff --git a/metadata/md5-cache/dev-ros/test_rospy-9999 b/metadata/md5-cache/dev-ros/test_rospy-9999
index 7b4b86f6552d..f7c2360fe894 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/test_rosmaster[python_single_target_python3_7(-)?,ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] test? ( python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) dev-ros/rosbuild dev-ros/rosgraph[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rospy https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/test_rosmaster[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d80f0a302cecdf7bb27f8f7d85c747c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=343ef308ff97f5697647c0ec5f428fc4
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.7 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.7
index 26644f0cfa60..0240d6b442c4 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.15.7
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734c88612fd93a78af4d96dc54ab2a7f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4975ffc5150062cc5ee2d2fdb57db371
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.15.8 b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
new file mode 100644
index 000000000000..02ac518688f8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DESCRIPTION=Unit tests for rospy
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4975ffc5150062cc5ee2d2fdb57db371
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-9999 b/metadata/md5-cache/dev-ros/test_rosservice-9999
index 30c786382d1c..4792e94e23d9 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/test_rosmaster[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/test_rosmaster[python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Unit tests for rospy
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_rosservice https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=734c88612fd93a78af4d96dc54ab2a7f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4975ffc5150062cc5ee2d2fdb57db371
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 07fdcf016d58..749afebfb3a5 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-cpp/gtest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?] dev-ros/tf2_msgs sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee36fd99e1f8fa951f3f2098e2191e4c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40dae25b144f69e0a9b627054d6bf424
diff --git a/metadata/md5-cache/dev-ros/test_tf2-9999 b/metadata/md5-cache/dev-ros/test_tf2-9999
index faaf063ef5e2..af827cc948f2 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-cpp/gtest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_single_target_python3_7(-)?] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[python_single_target_python3_7(-)?] dev-ros/tf2_kdl[python_single_target_python3_7(-)?] dev-ros/tf2_msgs sci-libs/orocos_kdl python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 unit tests
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/test_tf2 https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ee36fd99e1f8fa951f3f2098e2191e4c
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=40dae25b144f69e0a9b627054d6bf424
diff --git a/metadata/md5-cache/dev-ros/tf-1.13.2 b/metadata/md5-cache/dev-ros/tf-1.13.2
index e80b51e072b2..8805854f318c 100644
--- a/metadata/md5-cache/dev-ros/tf-1.13.2
+++ b/metadata/md5-cache/dev-ros/tf-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d6c2bb9e9ba914606f8abb98f538d18
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a28e07b932f1a638c560af23242e727
diff --git a/metadata/md5-cache/dev-ros/tf-9999 b/metadata/md5-cache/dev-ros/tf-9999
index 0637e8f34531..df98c0d6683a 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/rospkg[python_targets_python3_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1d6c2bb9e9ba914606f8abb98f538d18
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a28e07b932f1a638c560af23242e727
diff --git a/metadata/md5-cache/dev-ros/tf2-0.7.2 b/metadata/md5-cache/dev-ros/tf2-0.7.2
index ceedc6f705eb..bde828a71bdd 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=608915692620f7cf46b7cfaef9644839
diff --git a/metadata/md5-cache/dev-ros/tf2-9999 b/metadata/md5-cache/dev-ros/tf2-9999
index ac3525e31a53..0d920439f694 100644
--- a/metadata/md5-cache/dev-ros/tf2-9999
+++ b/metadata/md5-cache/dev-ros/tf2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2 https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/console_bridge:= dev-ros/rostime dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=608915692620f7cf46b7cfaef9644839
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 9f72a89374c6..29b258707339 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2 sci-physics/bullet 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1b23c496fd954d6b5686c4189143f22
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-9999 b/metadata/md5-cache/dev-ros/tf2_bullet-9999
index 7e8745203ad5..8f1e744a2bd7 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-9999
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2 sci-physics/bullet dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/tf2 sci-physics/bullet 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 bullet support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_bullet https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 sci-physics/bullet python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d1b23c496fd954d6b5686c4189143f22
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 c53b657e360a..d2bdd2fac2a1 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4e0f5f58e81c0a9740d6b9f6729a821
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-9999 b/metadata/md5-cache/dev-ros/tf2_eigen-9999
index eb32ea044793..25762fe59478 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-9999
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2 dev-ros/cmake_modules dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 eigen support
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_eigen https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2 python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=d4e0f5f58e81c0a9740d6b9f6729a821
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 0bac1303758e..46a25609e89c 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4276e1565852d8b13339502cd7d790d
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e2956bcb13456300599ac0d29ea8dd7
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
index 9b73a31ad228..b00e3d271e15 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_geometry_msgs https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4276e1565852d8b13339502cd7d790d
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e2956bcb13456300599ac0d29ea8dd7
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 2358a6bd2c42..70782660ca64 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/tf2_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/tf2_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e54fcc2026490e95eec608c353fcb8a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95c2de7315ef87e06ce8579e37d40137
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-9999 b/metadata/md5-cache/dev-ros/tf2_kdl-9999
index 05de0c9c4ba5..003860554763 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-9999
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/tf2_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/cmake_modules dev-cpp/eigen:3 test? ( dev-ros/rostest[python_single_target_python3_7(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=KDL binding for tf2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_kdl https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/tf2_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2 dev-ros/tf2_ros python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) sci-libs/orocos_kdl:= dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8e54fcc2026490e95eec608c353fcb8a
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 4ca325b0b194..65e9f68b8750 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7b231f8bc518afe60eb9d2449d8fa7c
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_msgs-9999
index 98f298822695..0e9bc96ca6b8 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 DESCRIPTION=TF2 messages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_msgs https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 08824937aaa4..c19d2f56b0e5 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1803d1f2fc8485c2eec6759a85ed020
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9cc679effdc13500184182748a4fdc81
diff --git a/metadata/md5-cache/dev-ros/tf2_py-9999 b/metadata/md5-cache/dev-ros/tf2_py-9999
index 36497b067929..908d3d39ec3d 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-9999
+++ b/metadata/md5-cache/dev-ros/tf2_py-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=TF2 python bindings
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_py https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d1803d1f2fc8485c2eec6759a85ed020
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 238454687f72..0e6bb00d3f8d 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a03352091855ec7c30ddfe224d4b42df
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d20caa1460ce4f0aaadfe028627fcfc6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-9999 b/metadata/md5-cache/dev-ros/tf2_ros-9999
index 5b9e02edb001..0fb1b63ef09e 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/actionlib[python_single_target_python3_7(-)?] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/actionlib_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a03352091855ec7c30ddfe224d4b42df
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d20caa1460ce4f0aaadfe028627fcfc6
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 a723b7743151..b5c80671edfe 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68be4e0f71ded4043d8852ff033b72da
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0a1f62ebd9630965cfdb81fa8f6722dc
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
index 0c7570a9a35a..85d692312eeb 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] ) dev-ros/cmake_modules dev-ros/sensor_msgs[ros_messages_cxx(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_sensor_msgs https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/python_orocos_kdl[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/python_orocos_kdl[python_targets_python3_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=68be4e0f71ded4043d8852ff033b72da
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0a1f62ebd9630965cfdb81fa8f6722dc
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 db81997003e3..36924d153f0f 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.7.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.7.2.tar.gz -> geometry2-0.7.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0885fbf1f723759be0fcab265c77b48f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-9999 b/metadata/md5-cache/dev-ros/tf2_tools-9999
index a9bde60adb53..a042c3699e90 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-9999
+++ b/metadata/md5-cache/dev-ros/tf2_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Tools for 2nd gen Transform library
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/tf2_tools https://github.com/ros/geometry2
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_py[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf2_py[python_single_target_python3_7(-)?] dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/roslib[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0885fbf1f723759be0fcab265c77b48f
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2f9f8f6f4d0f28799cd00517368c22a9
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.13.2 b/metadata/md5-cache/dev-ros/tf_conversions-1.13.2
index 91fe9ef2de30..4461e3595255 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.13.2
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e100e88fc1c26d1ff0e464f6720c4aa0
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=656dbc873140d99e79bda24bbb3feeff
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-9999 b/metadata/md5-cache/dev-ros/tf_conversions-9999
index e3471955724e..68d8ecc38fcc 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-9999
+++ b/metadata/md5-cache/dev-ros/tf_conversions-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/orocos_kdl:= dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/kdl_conversions dev-ros/tf[python_single_target_python3_7(-)?] sci-libs/orocos_kdl:= dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e100e88fc1c26d1ff0e464f6720c4aa0
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=656dbc873140d99e79bda24bbb3feeff
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 6d624c808c0e..80e06ab419f6 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,16 +1,16 @@
 BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.14.0.tar.gz -> image_transport_plugins-1.14.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 161ed5967c5b..dee1beb5f2fd 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-9999
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0e8ec5aaf31998424597dc48252b348b
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8 b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
index 0f25ed63e760..0dd6456a6593 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/timestamp_tools https://github.com/ros-drivers/driver_common
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roslib dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=b63217d0d3258dd92d21164bf4fe164c
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-9999 b/metadata/md5-cache/dev-ros/timestamp_tools-9999
index 64552dc9ec74..1c54edb12aa5 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-9999
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/timestamp_tools https://github.com/ros-drivers/driver_common
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslib dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1f7ec6104c16657e69125aec8916eea0
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.7 b/metadata/md5-cache/dev-ros/topic_tools-1.15.7
index 79f781ea3654..2421e1c04998 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.15.7
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc21c2b8712b4de8b6facff6da127598
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a747341a294022c1dd4153bc001ebb2
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.15.8 b/metadata/md5-cache/dev-ros/topic_tools-1.15.8
new file mode 100644
index 000000000000..ff8b0f4c192b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.15.8
@@ -0,0 +1,16 @@
+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(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+DESCRIPTION=Tools for directing, throttling and selecting ROS topics
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a747341a294022c1dd4153bc001ebb2
diff --git a/metadata/md5-cache/dev-ros/topic_tools-9999 b/metadata/md5-cache/dev-ros/topic_tools-9999
index 51a6990163e6..0f59bb977446 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_tools-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] dev-ros/rosunit[python_single_target_python3_7(-)?] dev-cpp/gtest python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/topic_tools https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bc21c2b8712b4de8b6facff6da127598
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5a747341a294022c1dd4153bc001ebb2
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 c01c15764bd0..c30e666bbf7f 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bbf0b7ab7b64de0c4bc8003a72476753
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-9999 b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
index 0ed91751b0da..e0fbf701a982 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/trajectory_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 cb48e5f47959..1e296bf392a1 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.19.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.19.1.tar.gz -> ros_control-0.19.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31e5204891176d981de353664e11805d
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-9999 b/metadata/md5-cache/dev-ros/transmission_interface-9999
index 9e1bc1f41b53..757e60b23344 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Transmission Interface
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/transmission_interface https://github.com/ros-controls/ros_control
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=31e5204891176d981de353664e11805d
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 ac9077e9a936..034a1b3df21b 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.12
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.12.tar.gz -> common_tutorials-0.1.12.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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
new file mode 100644
index 000000000000..bd74844108de
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.2.0
@@ -0,0 +1,16 @@
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
+IUSE=+python_single_target_python3_7 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0d3d7af5649a4f79b3ce1811313fdfa2
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-9999 b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
index 40c0dc902145..7d1a17d7e7df 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtle_actionlib https://github.com/ros/common_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 283dd3e2b51b..dac778fc5cbc 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c2c2c042baf68d527d0ff027103f177
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ae62db7e6c587787a0a6ca43de3278e
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-9999 b/metadata/md5-cache/dev-ros/turtle_tf-9999
index c0713c1c9346..17d86673df93 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/tf[python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0c2c2c042baf68d527d0ff027103f177
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 6bf9828bea09..669c457ffbdc 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.3.tar.gz -> geometry_tutorials-0.2.3.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=809c05b3a61226eec63e6be313dbe4b8
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=829faea29e10805c1a1ece323ba5634d
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-9999 b/metadata/md5-cache/dev-ros/turtle_tf2-9999
index 989fb414bff8..39f79101c299 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/turtlesim[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/roscpp dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/tf2 dev-ros/tf2_ros[python_single_target_python3_7(-)?] dev-ros/tf2_geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/turtlesim[python_single_target_python3_7(-)?] dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=809c05b3a61226eec63e6be313dbe4b8
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 11d3be5d6afd..480a567a2ebb 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.10.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.10.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=f7677c36614a0cffdd2412a51db29924
diff --git a/metadata/md5-cache/dev-ros/turtlesim-9999 b/metadata/md5-cache/dev-ros/turtlesim-9999
index 1721df979e6e..92832b680345 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-9999
+++ b/metadata/md5-cache/dev-ros/turtlesim-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/turtlesim https://github.com/ros/ros_tutorials
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/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(-)?] ) dev-ros/geometry_msgs[ros_messages_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(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 02d316557c37..d077819e0330 100644
--- a/metadata/md5-cache/dev-ros/unique_id-1.0.6
+++ b/metadata/md5-cache/dev-ros/unique_id-1.0.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.6.tar.gz -> unique_identifier-1.0.6.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4c75718446f3fb48a2407b7f79ff25e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1599b2a82a57b0cad47d482971da4e24
diff --git a/metadata/md5-cache/dev-ros/unique_id-9999 b/metadata/md5-cache/dev-ros/unique_id-9999
index d1a7263cd09a..4d3e6fa4546d 100644
--- a/metadata/md5-cache/dev-ros/unique_id-9999
+++ b/metadata/md5-cache/dev-ros/unique_id-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/uuid_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] 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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/uuid_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4c75718446f3fb48a2407b7f79ff25e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1599b2a82a57b0cad47d482971da4e24
diff --git a/metadata/md5-cache/dev-ros/urdf-1.13.2 b/metadata/md5-cache/dev-ros/urdf-1.13.2
index 60c8cff36122..0f0fe814abaf 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.13.2
+++ b/metadata/md5-cache/dev-ros/urdf-1.13.2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24ed7f3181d3b32a998f79f350124504
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10d11eaa7cae24cd04765059bd276a27
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index 8fb365be2db4..869c4131abcb 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-libs/urdfdom dev-libs/urdfdom_headers dev-ros/urdf_parser_plugin dev-ros/pluginlib dev-ros/rosconsole_bridge dev-libs/console_bridge:= dev-ros/roscpp dev-libs/tinyxml dev-libs/tinyxml2:= dev-ros/class_loader:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] dev-cpp/gtest ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf https://github.com/ros/urdf
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24ed7f3181d3b32a998f79f350124504
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=10d11eaa7cae24cd04765059bd276a27
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 15052e94755b..11d3996870f9 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/urdfdom_headers python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/urdfdom_headers python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf/archive/1.13.2.tar.gz -> urdf-1.13.2.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=6d155665f4fc307edfcd3c35960fe013
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
index 9e598d199f50..6470e9403a85 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/urdfdom_headers python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_parser_plugin https://github.com/ros/urdf
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/urdfdom_headers python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/urdfdom_headers python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 cff3843f5be0..5d67555b7c76 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.5.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro test? ( dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=URDF tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_tutorial/archive/0.5.0.tar.gz -> urdf_tutorial-0.5.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a1b4bf227f64c792dc76dd80bc4368
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ca20dd2bc9cccac68bda81c9e6e8914f
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-9999 b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
index 851d9ad48808..729d9dd7dead 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=URDF tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/urdf_tutorial https://github.com/ros/urdf_tutorial
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/joint_state_publisher_gui dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a1b4bf227f64c792dc76dd80bc4368
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 365e41d9599d..b07e98bb600f 100644
--- a/metadata/md5-cache/dev-ros/urg_c-1.0.405
+++ b/metadata/md5-cache/dev-ros/urg_c-1.0.405
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_c/archive/1.0.405.tar.gz -> urg_c-1.0.405.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1be427a884cf104a28fb052f00135c47
diff --git a/metadata/md5-cache/dev-ros/urg_c-9999 b/metadata/md5-cache/dev-ros/urg_c-9999
index b0a6d74b034f..eb5652eed6b7 100644
--- a/metadata/md5-cache/dev-ros/urg_c-9999
+++ b/metadata/md5-cache/dev-ros/urg_c-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=1be427a884cf104a28fb052f00135c47
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.13 b/metadata/md5-cache/dev-ros/urg_node-0.1.13
index 3c7a0447f911..a3155947ec56 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.13
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.13
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.13.tar.gz -> urg_node-0.1.13.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8ba7a35a0ba01b196b811df853b7e67
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82bf15c405ab53fcd061ffec7f4f087d
diff --git a/metadata/md5-cache/dev-ros/urg_node-9999 b/metadata/md5-cache/dev-ros/urg_node-9999
index 75fa7eef4516..89b2aa329d26 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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(-)?] 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(-)] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?]
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_single_target_python3_7(-)?] 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c8ba7a35a0ba01b196b811df853b7e67
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=82bf15c405ab53fcd061ffec7f4f087d
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 aaf955791abf..75a702f791e2 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/uuid_msgs https://github.com/ros-geographic-info/unique_identifier
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=3ce3229db0b1c2ed3f5aa1837255b65c
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-9999 b/metadata/md5-cache/dev-ros/uuid_msgs-9999
index 48238c857113..38cea0bb86f1 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-9999
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/uuid_msgs https://github.com/ros-geographic-info/unique_identifier
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 e1568c20b904..bd150fdad5d4 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 5df359b7f938..a1ff55d7c2a3 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 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
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 b6fbe3315adc..57a0f44ea2ff 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.11.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=00ebeb1636ad11ff4ccd40191a09d4b1
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-9999 b/metadata/md5-cache/dev-ros/visp_bridge-9999
index 742a562cbc83..3c862b1e1ac9 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visp_bridge https://github.com/lagadic/vision_visp
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=sci-libs/ViSP:=[xml] dev-ros/roscpp dev-ros/camera_calibration_parsers dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 9936348151d0..76dbfbfd8734 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.11.1.tar.gz -> vision_visp-0.11.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0fdf2ad5a777d2244d5f7b3d6a527fac
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index a7f364eb0d3b..42da61a23d23 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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:= 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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:= dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-libs/boost:= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_single_target_python3_7(-)?] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=0fdf2ad5a777d2244d5f7b3d6a527fac
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 9b4887343671..b1a9aa87e746 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 f58d4d4f1791..b69434ec8f9e 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 3033898078de..9c5b2176f24a 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.11.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 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_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b83af724d994dd78b7d232e2f3427564
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64312a362150d743d60275643dbb6419
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index 3c3fa23f0011..5851d1f0401a 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+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(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) 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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 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
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] 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_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_single_target_python3_7(-)?] 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(-)?] dev-ros/rospy[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/numpy[python_targets_python3_7(-)] ) 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] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b83af724d994dd78b7d232e2f3427564
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_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 cf2777f740a8..a759426495cb 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,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Visualization marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.11.0.tar.gz -> visualization_tutorials-0.11.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 6e2c943409a8..07d1a5c9d32a 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Visualization marker tutorials
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_marker_tutorials https://github.com/ros-visualization/visualization_tutorials
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 fac559d362e6..d38bba3d4e45 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.7.tar.gz -> common_msgs-1.12.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 881e53dbc0b7..ba3c8d8d90fb 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.13.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.13.0.tar.gz -> common_msgs-1.13.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=146e0f3b8edd5fd6437fde736305474c
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-9999 b/metadata/md5-cache/dev-ros/visualization_msgs-9999
index d5b1b62f4250..4d472bcb45df 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-9999
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_single_target_python3_7(-)?] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/visualization_msgs https://github.com/ros/common_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+IUSE=+python_single_target_python3_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) ros_messages_cxx? ( dev-ros/gencpp:=[python_single_target_python3_7(-)?] ) ros_messages_eus? ( dev-ros/geneus:=[python_single_target_python3_7(-)?] ) ros_messages_python? ( dev-ros/genpy:=[python_single_target_python3_7(-)?] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_single_target_python3_7(-)?] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_single_target_python3_7(-)?] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_single_target_python3_7(-)?] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_single_target_python3_7(-)?] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 56c2b85c5f12..e4d2990e385d 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.16.6
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.16.6.tar.gz -> navigation-1.16.6.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _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 216783b3b2ad..59d0527d7414 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.17.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.17.0.tar.gz -> navigation-1.17.0.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-9999 b/metadata/md5-cache/dev-ros/voxel_grid-9999
index fe127ce7fe74..64365c1d15ba 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-9999
+++ b/metadata/md5-cache/dev-ros/voxel_grid-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/voxel_grid https://github.com/ros-planning/navigation
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roscpp python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=362dcdfbcfe82e7103ecd7af2b00eb12
diff --git a/metadata/md5-cache/dev-ros/xacro-1.14.1 b/metadata/md5-cache/dev-ros/xacro-1.14.1
index e423961036f4..bcaf43ce0836 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.14.1
+++ b/metadata/md5-cache/dev-ros/xacro-1.14.1
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslint[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=XML macro language
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roslint[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.14.1.tar.gz -> xacro-1.14.1.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b986dd33325a0c5f359daaab6c7e777e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e9cfe2d9ba8da3a0d41388ec5969f74
diff --git a/metadata/md5-cache/dev-ros/xacro-9999 b/metadata/md5-cache/dev-ros/xacro-9999
index 81382882b824..c6b6a2871efe 100644
--- a/metadata/md5-cache/dev-ros/xacro-9999
+++ b/metadata/md5-cache/dev-ros/xacro-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslint[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] test? ( dev-ros/rostest[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-python/nose[python_targets_python3_7(-)] ) ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=XML macro language
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xacro https://github.com/ros/xacro
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roslint[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslaunch[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/roslint[python_single_target_python3_7(-)?] dev-ros/roslaunch[python_single_target_python3_7(-)?] python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b986dd33325a0c5f359daaab6c7e777e
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6e9cfe2d9ba8da3a0d41388ec5969f74
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
index 05bcd73d196a..4a79abe9b6c9 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.4
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.4.tar.gz -> ros_comm-1.15.4.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
index 6bc27830da7d..c3a79ad4f05a 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.7
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.15.7.tar.gz -> ros_comm-1.15.7.tar.gz
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
new file mode 100644
index 000000000000..ce50d693b4c7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.15.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
+DESCRIPTION=C++ implementation of the XML-RPC protocol
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
+IUSE=+python_single_target_python3_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/ros_comm/archive/1.15.8.tar.gz -> ros_comm-1.15.8.tar.gz
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4e5fecdde253ed2037b490e81e167990
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index 776c92be7fde..3528da187a7b 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_7? ( dev-util/catkin[python_targets_python3_7(-)] ) python_single_target_python3_7? ( dev-python/empy[python_targets_python3_7(-)] )
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/xmlrpcpp https://github.com/ros/ros_comm
-IUSE=python_targets_python3_6 test
+IUSE=+python_single_target_python3_7 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cpp_common python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
+RDEPEND=dev-ros/cpp_common python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] )
+REQUIRED_USE=^^ ( python_single_target_python3_7 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=cmake	f274d2f953f93e2d88cd3e0b2ce376a9	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	84666c5b80bdfba76c7c55ec5f55882b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=4e5fecdde253ed2037b490e81e167990