2017-01-01 16:50:46 UTC

1524 files changed, 3048 insertions, 3048 deletions

diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.5 b/metadata/md5-cache/dev-ros/actionlib-1.11.5
index 486cbc63e064..451d283c0456 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.5
+++ b/metadata/md5-cache/dev-ros/actionlib-1.11.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.11.5.tar.gz -> actionlib-1.11.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbedd6368f402e2e78c431cfdb6f56cf
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.6 b/metadata/md5-cache/dev-ros/actionlib-1.11.6
index bce58da39a8e..aa3ae479e13f 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.6
+++ b/metadata/md5-cache/dev-ros/actionlib-1.11.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.11.6.tar.gz -> actionlib-1.11.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=733618bbc8fd2636025fb9b54d40426b
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.7 b/metadata/md5-cache/dev-ros/actionlib-1.11.7
index 1e4b72bd2ceb..a106cefd423d 100644
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.7
+++ b/metadata/md5-cache/dev-ros/actionlib-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 SLOT=0
 SRC_URI=https://github.com/ros/actionlib/archive/1.11.7.tar.gz -> actionlib-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=733618bbc8fd2636025fb9b54d40426b
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index 506718793d19..bb000aa3d6a0 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbedd6368f402e2e78c431cfdb6f56cf
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.3 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.3
index 2c4a711ba3a9..79060a39aad2 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2224f70cef7f021e48eb8900e8c925d4
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.4 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.4
index b3f7f6816fa3..71f6c62568da 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2224f70cef7f021e48eb8900e8c925d4
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5 b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
index 69c2b77dceeb..75f68ed75f5f 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82f9fa2565577dfcaeab6b69d306306e
diff --git a/metadata/md5-cache/dev-ros/actionlib_msgs-9999 b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
index fd0c3aa3ca18..4dab6180a72c 100644
--- a/metadata/md5-cache/dev-ros/actionlib_msgs-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages to interact with an action server and an action client
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2224f70cef7f021e48eb8900e8c925d4
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
index efaf35a96069..95725bd1c5dd 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Actionlib tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] dev-util/catk
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc67d7b24db38b1b103e37c96f4f5e3c
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8 b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
index ae285c9a2723..6229d5c17738 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Actionlib tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] dev-util/catk
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ef6542f0abfc2ecbe580c37cc53c945
diff --git a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999 b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
index 62ef67725b63..5f46884f1bba 100644
--- a/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/actionlib_tutorials-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Actionlib tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/actionlib_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/actionlib dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ef6542f0abfc2ecbe580c37cc53c945
diff --git a/metadata/md5-cache/dev-ros/amcl-1.14.0 b/metadata/md5-cache/dev-ros/amcl-1.14.0
index 0b00e44a9024..b262fe87c179 100644
--- a/metadata/md5-cache/dev-ros/amcl-1.14.0
+++ b/metadata/md5-cache/dev-ros/amcl-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/amcl
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[pyt
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ba9b4d8d17ee063577447107114dc7b
diff --git a/metadata/md5-cache/dev-ros/amcl-9999 b/metadata/md5-cache/dev-ros/amcl-9999
index 7742dc0f93fb..f0b406e32cb9 100644
--- a/metadata/md5-cache/dev-ros/amcl-9999
+++ b/metadata/md5-cache/dev-ros/amcl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Probabilistic localization system for a robot moving in 2D
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/amcl
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/rosbag dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ba9b4d8d17ee063577447107114dc7b
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.10 b/metadata/md5-cache/dev-ros/angles-1.9.10
index 094782e0e63a..605082de82aa 100644
--- a/metadata/md5-cache/dev-ros/angles-1.9.10
+++ b/metadata/md5-cache/dev-ros/angles-1.9.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pyxml test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-python/pyxml test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/angles
@@ -10,5 +10,5 @@ RDEPEND=dev-python/pyxml dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/angles/archive/1.9.10.tar.gz -> angles-1.9.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7691e7ce2559295fffd6db0b772aa8a
diff --git a/metadata/md5-cache/dev-ros/angles-9999 b/metadata/md5-cache/dev-ros/angles-9999
index 76fdd7c4776c..f8eabdf857e8 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/pyxml test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-python/pyxml test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of simple math utilities to work with angles
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/angles
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/pyxml dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7691e7ce2559295fffd6db0b772aa8a
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.2.12 b/metadata/md5-cache/dev-ros/audio_capture-0.2.12
index 14026047b81f..d6ca596bbce6 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.2.12
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.2.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_capture
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.12.tar.gz -> audio_common-0.2.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cf62e552da9503c9094f0bb755ea4e4
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.1 b/metadata/md5-cache/dev-ros/audio_capture-0.3.1
index 013a207d6f10..46f1b3916c31 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.1
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_capture
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6714ce09828413180cf568aff08fa806
diff --git a/metadata/md5-cache/dev-ros/audio_capture-9999 b/metadata/md5-cache/dev-ros/audio_capture-9999
index ace8677233f6..65e7bddf58dc 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transports audio from a source to a destination
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_capture
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6714ce09828413180cf568aff08fa806
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.10 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.10
index bfb482fb3d23..0b4d676ea040 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.10
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.10.tar.gz -> audio_common-0.2.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.11 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.11
index 035b40199cbe..14ede5cf1eb8 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.11
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.11.tar.gz -> audio_common-0.2.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.12 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.12
index 83ba5617dfa1..cd63f59fa7ec 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.12
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.12.tar.gz -> audio_common-0.2.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.7 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.7
index af6dc6f016fa..3f94c9a69e1e 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.7
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.7.tar.gz -> audio_common-0.2.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.8 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.8
index e1810849ec22..b414d031b24c 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.8
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.8.tar.gz -> audio_common-0.2.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9
index 7a3f1a5bd80d..428e089d31f2 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.2.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.9.tar.gz -> audio_common-0.2.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
index 1d762a821443..5ce260f712d4 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c05482e644159e326b46b1c500b76b00
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-9999 b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
index 13534c01ac06..6e1646538ecb 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_common_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96e68934ea9c36c772a1b1837cd3f10d
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.2.12 b/metadata/md5-cache/dev-ros/audio_play-0.2.12
index 3ce735fdcfe2..fe3c8557b145 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.2.12
+++ b/metadata/md5-cache/dev-ros/audio_play-0.2.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:0.10 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_play
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.12.tar.gz -> audio_common-0.2.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d02c4ab89c354af74d22fa408bef2735
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.1 b/metadata/md5-cache/dev-ros/audio_play-0.3.1
index 7854fab2e326..87d01f33acbd 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.1
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_play
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/b
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08605f8104cc5c004f736f9928acdce0
diff --git a/metadata/md5-cache/dev-ros/audio_play-9999 b/metadata/md5-cache/dev-ros/audio_play-9999
index 0b87eb8b021f..8f1d65dd43c1 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Outputs audio to a speaker from a source node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/audio_play
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] 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 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=08605f8104cc5c004f736f9928acdce0
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.13.0 b/metadata/md5-cache/dev-ros/base_local_planner-1.13.0
index 3e25db5396ea..722553b8fe6f 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.13.0
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/base_local_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aec8ae898f73aac7334107c595a2eb2e
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.13.1 b/metadata/md5-cache/dev-ros/base_local_planner-1.13.1
index 3619bd659944..3d95d28b5c1b 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.13.1
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/base_local_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aec8ae898f73aac7334107c595a2eb2e
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-1.14.0 b/metadata/md5-cache/dev-ros/base_local_planner-1.14.0
index 6f2925a65564..b867842b437d 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-1.14.0
+++ b/metadata/md5-cache/dev-ros/base_local_planner-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/base_local_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ff1affb6ecef9b0768856d71e2dc1e9
diff --git a/metadata/md5-cache/dev-ros/base_local_planner-9999 b/metadata/md5-cache/dev-ros/base_local_planner-9999
index 765c98bd2c04..027a2d7ca855 100644
--- a/metadata/md5-cache/dev-ros/base_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/base_local_planner-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Trajectory Rollout and Dynamic Window approaches to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/base_local_planner
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/pcl_conversions dev-ros/rostest dev-ros/costmap_2d dev-ros/pluginlib dev-ros/angles dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aec8ae898f73aac7334107c595a2eb2e
diff --git a/metadata/md5-cache/dev-ros/bond-1.7.16 b/metadata/md5-cache/dev-ros/bond-1.7.16
index acea74c73f5c..199bc4c88e23 100644
--- a/metadata/md5-cache/dev-ros/bond-1.7.16
+++ b/metadata/md5-cache/dev-ros/bond-1.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bond
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.16.tar.gz -> bond_core-1.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b53c28cdaf2248f2e04f18c98409d019
diff --git a/metadata/md5-cache/dev-ros/bond-1.7.17 b/metadata/md5-cache/dev-ros/bond-1.7.17
index 36f601391c2f..f3e4ae5917e0 100644
--- a/metadata/md5-cache/dev-ros/bond-1.7.17
+++ b/metadata/md5-cache/dev-ros/bond-1.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bond
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.17.tar.gz -> bond_core-1.7.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b53c28cdaf2248f2e04f18c98409d019
diff --git a/metadata/md5-cache/dev-ros/bond-1.7.18 b/metadata/md5-cache/dev-ros/bond-1.7.18
index 8275e141e850..59d4e17fe6eb 100644
--- a/metadata/md5-cache/dev-ros/bond-1.7.18
+++ b/metadata/md5-cache/dev-ros/bond-1.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bond
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.18.tar.gz -> bond_core-1.7.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=db5c75f9d7e0fdf10fb66e2f5f2eaef5
diff --git a/metadata/md5-cache/dev-ros/bond-9999 b/metadata/md5-cache/dev-ros/bond-9999
index f2faaf8dc328..1b327819afe2 100644
--- a/metadata/md5-cache/dev-ros/bond-9999
+++ b/metadata/md5-cache/dev-ros/bond-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=A bond allows two processes, A and B, to know when the other has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bond
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b53c28cdaf2248f2e04f18c98409d019
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.7.16 b/metadata/md5-cache/dev-ros/bondcpp-1.7.16
index 4211788c017f..77fe870d9a71 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.7.16
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-lib
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.16.tar.gz -> bond_core-1.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18510d0202d3d655f8954b8541a3e6cd
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.7.17 b/metadata/md5-cache/dev-ros/bondcpp-1.7.17
index a6c00cb262ea..4d78f65c86b9 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.7.17
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-lib
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.17.tar.gz -> bond_core-1.7.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18510d0202d3d655f8954b8541a3e6cd
diff --git a/metadata/md5-cache/dev-ros/bondcpp-1.7.18 b/metadata/md5-cache/dev-ros/bondcpp-1.7.18
index 3794a944d196..bc1f1e63e84c 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-1.7.18
+++ b/metadata/md5-cache/dev-ros/bondcpp-1.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-lib
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.18.tar.gz -> bond_core-1.7.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e087d61c647839f1fa289e705b2000ac
diff --git a/metadata/md5-cache/dev-ros/bondcpp-9999 b/metadata/md5-cache/dev-ros/bondcpp-9999
index b261cd9cc1c0..43fd2f1dd042 100644
--- a/metadata/md5-cache/dev-ros/bondcpp-9999
+++ b/metadata/md5-cache/dev-ros/bondcpp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondcpp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bond dev-ros/cmake_modules dev-ros/roscpp dev-ros/smclib dev-libs/boost:= sys-apps/util-linux dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18510d0202d3d655f8954b8541a3e6cd
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.16 b/metadata/md5-cache/dev-ros/bondpy-1.7.16
index 8bb47308f5b9..e3a619b88b62 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.16
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondpy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.16.tar.gz -> bond_core-1.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbc3655fb35f7377da48df0bcf8eff0d
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.17 b/metadata/md5-cache/dev-ros/bondpy-1.7.17
index cfef6d2a8d6f..eff8f4277924 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.17
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondpy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.17.tar.gz -> bond_core-1.7.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbc3655fb35f7377da48df0bcf8eff0d
diff --git a/metadata/md5-cache/dev-ros/bondpy-1.7.18 b/metadata/md5-cache/dev-ros/bondpy-1.7.18
index 0b0ba31e7ac4..a751a9c3e6b6 100644
--- a/metadata/md5-cache/dev-ros/bondpy-1.7.18
+++ b/metadata/md5-cache/dev-ros/bondpy-1.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondpy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.18.tar.gz -> bond_core-1.7.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2fa230478178d9b6d1b0765d6cd680ee
diff --git a/metadata/md5-cache/dev-ros/bondpy-9999 b/metadata/md5-cache/dev-ros/bondpy-9999
index 0a274f3f9cdf..ef2c317d794d 100644
--- a/metadata/md5-cache/dev-ros/bondpy-9999
+++ b/metadata/md5-cache/dev-ros/bondpy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python implementation of bond, a mechanism for checking when another process has terminated
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/bondpy
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bond[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smclib sys-apps/util-linux dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbc3655fb35f7377da48df0bcf8eff0d
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13 b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13
index 63f468786ddf..14f9708da61e 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_estimation
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4dbd36524fee8225525de58486671a04
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 269820ed1302..586294fd4025 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-0.10.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_estimation
@@ -10,5 +10,5 @@ RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4dbd36524fee8225525de58486671a04
diff --git a/metadata/md5-cache/dev-ros/calibration_estimation-9999 b/metadata/md5-cache/dev-ros/calibration_estimation-9999
index 89318ac1ccf5..127bc588bc5c 100644
--- a/metadata/md5-cache/dev-ros/calibration_estimation-9999
+++ b/metadata/md5-cache/dev-ros/calibration_estimation-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Runs an optimization to estimate the a robot's kinematic parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_estimation
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urdf_parser_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4dbd36524fee8225525de58486671a04
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-0.10.13 b/metadata/md5-cache/dev-ros/calibration_launch-0.10.13
index e1ae7fb9b7b7..9d3b6ec6b087 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files that can be helpful in configuring the calibration stack to run on your robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98eae2dac22868821d0462ee75d4f92e
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 1467029cd37d..8019e9a71e9a 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_launch-0.10.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files that can be helpful in configuring the calibration stack to run on your robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/interval_intersection dev-ros/joint_states_settler dev-ros/laser
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98eae2dac22868821d0462ee75d4f92e
diff --git a/metadata/md5-cache/dev-ros/calibration_launch-9999 b/metadata/md5-cache/dev-ros/calibration_launch-9999
index 8b729d24f756..e56cbb538c57 100644
--- a/metadata/md5-cache/dev-ros/calibration_launch-9999
+++ b/metadata/md5-cache/dev-ros/calibration_launch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files that can be helpful in configuring the calibration stack to run on your robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_launch
@@ -8,5 +8,5 @@ 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 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98eae2dac22868821d0462ee75d4f92e
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.13 b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.13
index f9b8f9fa887f..6cef233abaff 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for storing calibration samples to be used in full robot calibration procedures
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcdffa7c20861772c6851de22f7a1c54
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 3243df408eae..6808135ed8d5 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-0.10.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for storing calibration samples to be used in full robot calibration procedures
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcdffa7c20861772c6851de22f7a1c54
diff --git a/metadata/md5-cache/dev-ros/calibration_msgs-9999 b/metadata/md5-cache/dev-ros/calibration_msgs-9999
index f8921c3bceba..d0df0c3b4d6b 100644
--- a/metadata/md5-cache/dev-ros/calibration_msgs-9999
+++ b/metadata/md5-cache/dev-ros/calibration_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for storing calibration samples to be used in full robot calibration procedures
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcdffa7c20861772c6851de22f7a1c54
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13 b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13
index a8bd8ddb4e6b..3cbffca7e061 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-0.10.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_setup_helper
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/calibration_launch dev-util/catkin[python_targets_python2_7(-)?,
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47de79593cc3e8d3da378cc6d7ed3e91
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 bcde1d0ddf48..af8718f6756b 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_setup_helper
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/calibration_launch dev-util/catkin[python_targets_python2_7(-)?,
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47de79593cc3e8d3da378cc6d7ed3e91
diff --git a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999 b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
index a36704090aca..51cefb5856b2 100644
--- a/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
+++ b/metadata/md5-cache/dev-ros/calibration_setup_helper-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Script to generate calibration launch and configurationfiles for your robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/calibration_setup_helper
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/calibration_launch dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47de79593cc3e8d3da378cc6d7ed3e91
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.14 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.14
index 2a56f2a03801..fc525d28d438 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.14
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Calibration of monocular or stereo cameras using a checkerboard calibration target
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c282cecda83bb8d6764e4868913a2c3b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.15 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.15
index 076659b511dc..9bf90e1211a9 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.15
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Calibration of monocular or stereo cameras using a checkerboard calibration target
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c282cecda83bb8d6764e4868913a2c3b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.16 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.16
index ce2b1fd18ace..e53a8f20c89c 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.16
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Calibration of monocular or stereo cameras using a checkerboard calibration target
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c282cecda83bb8d6764e4868913a2c3b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.18 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.18
index b4c1bd49d68f..fa468fa86b97 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.18
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Calibration of monocular or stereo cameras using a checkerboard calibration target
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5928b499cf960952032b481315259e75
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-1.12.19 b/metadata/md5-cache/dev-ros/camera_calibration-1.12.19
index 6b0b90e71a8b..52aea0df0277 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-1.12.19
+++ b/metadata/md5-cache/dev-ros/camera_calibration-1.12.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Calibration of monocular or stereo cameras using a checkerboard calibration target
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5928b499cf960952032b481315259e75
diff --git a/metadata/md5-cache/dev-ros/camera_calibration-9999 b/metadata/md5-cache/dev-ros/camera_calibration-9999
index 603715103450..022e8bb9c483 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Calibration of monocular or stereo cameras using a checkerboard calibration target
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_single_target_python2_7] ) dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c282cecda83bb8d6764e4868913a2c3b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.10 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.10
index c58cbb3fbf09..b0c75ba0e827 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.10
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration_parsers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ro
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.10.tar.gz -> image_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc5b1da4fab497d7f3b1314153823f01
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.11 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.11
index dd825c6dd396..b483690eeb36 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.11
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration_parsers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ro
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.11.tar.gz -> image_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=34dc4da3295fd4d17ea45ef625073479
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.7 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.7
index e148ad5a91b5..bc1cfb5720f8 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.7
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration_parsers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-ros/roscon
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.7.tar.gz -> image_common-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd320a1b6e60f6aaacd4ad3887477604
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.8 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.8
index ef679bad12b5..33705a09ae5f 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.8
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration_parsers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-ros/roscon
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.8.tar.gz -> image_common-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd320a1b6e60f6aaacd4ad3887477604
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.9 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.9
index edb69cc34a23..3abb66e440e4 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.9
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration_parsers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ro
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.9.tar.gz -> image_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc5b1da4fab497d7f3b1314153823f01
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
index 2df00a76e251..106aa46d287a 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 virtual/pkgconfig test? ( dev-python/nose ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Routines for reading and writing camera calibration parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_calibration_parsers
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:=[python] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc5b1da4fab497d7f3b1314153823f01
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
index ec24a6790b35..ddecfe28fd11 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_info_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.10.tar.gz -> image_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e3789657dd39f475e4ee5e6c171a8e7
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
index 81e555a4eff1..d064b4303bb2 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_info_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.11.tar.gz -> image_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d64d451271f564be28ece7154a23099c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
index 8851aa80520a..1e892edc545b 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_info_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.7.tar.gz -> image_common-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e3789657dd39f475e4ee5e6c171a8e7
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
index b79d40df2110..e0c7bbed2a01 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_info_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.8.tar.gz -> image_common-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e3789657dd39f475e4ee5e6c171a8e7
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
index 9ace86f8654d..0441a7078db7 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_info_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscp
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.9.tar.gz -> image_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e3789657dd39f475e4ee5e6c171a8e7
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-9999 b/metadata/md5-cache/dev-ros/camera_info_manager-9999
index 5ed4cebd5c88..71ccf1583636 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -1,5 +1,5 @@
 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-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ interface for camera calibration information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/camera_info_manager
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0e3789657dd39f475e4ee5e6c171a8e7
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.13.0 b/metadata/md5-cache/dev-ros/carrot_planner-1.13.0
index 05841a56f0fd..365b97c4602e 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.13.0
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/carrot_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/ba
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=933d315c460ea1ecab199ba59dd19453
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.13.1 b/metadata/md5-cache/dev-ros/carrot_planner-1.13.1
index cb8821a84aa7..fa5c0e8bbd11 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.13.1
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/carrot_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/ba
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=933d315c460ea1ecab199ba59dd19453
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-1.14.0 b/metadata/md5-cache/dev-ros/carrot_planner-1.14.0
index ff2dabbb7e0e..47301291481e 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-1.14.0
+++ b/metadata/md5-cache/dev-ros/carrot_planner-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/carrot_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/ba
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f2f9b4a56649a18147031a039bd9626
diff --git a/metadata/md5-cache/dev-ros/carrot_planner-9999 b/metadata/md5-cache/dev-ros/carrot_planner-9999
index 9820093edcdd..248984c213e7 100644
--- a/metadata/md5-cache/dev-ros/carrot_planner-9999
+++ b/metadata/md5-cache/dev-ros/carrot_planner-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Attempts to find a legal place to put a carrot for the robot to follow
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/carrot_planner
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_core dev-ros/costmap_2d dev-ros/base_local_planner dev-ros/pluginlib dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=933d315c460ea1ecab199ba59dd19453
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.3.5 b/metadata/md5-cache/dev-ros/class_loader-0.3.5
index 731d1dc62488..57eed56d44c4 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.3.5
+++ b/metadata/md5-cache/dev-ros/class_loader-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/class_loader
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/c
 SLOT=0
 SRC_URI=https://github.com/ros/class_loader/archive/0.3.5.tar.gz -> class_loader-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a769551d49efa0ebb5bb0c5aa247a9a0
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.3.6 b/metadata/md5-cache/dev-ros/class_loader-0.3.6
index 6ef0fa748c73..1c06bbdf3a63 100644
--- a/metadata/md5-cache/dev-ros/class_loader-0.3.6
+++ b/metadata/md5-cache/dev-ros/class_loader-0.3.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/class_loader
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/c
 SLOT=0
 SRC_URI=https://github.com/ros/class_loader/archive/0.3.6.tar.gz -> class_loader-0.3.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a769551d49efa0ebb5bb0c5aa247a9a0
diff --git a/metadata/md5-cache/dev-ros/class_loader-9999 b/metadata/md5-cache/dev-ros/class_loader-9999
index 66c5bdec8e64..3ad37a77f6dd 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS-independent package for loading plugins
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/class_loader
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d960286b5cd690970988a0f8967f2f8f
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
index 4505615fc4d0..f552b23f96fb 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/r
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56b86d9db20d34cf10e36d0dc0d93361
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index eac1f2cfa4cc..9013cbde5cee 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56b86d9db20d34cf10e36d0dc0d93361
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.4.0 b/metadata/md5-cache/dev-ros/cmake_modules-0.4.0
index 685c6efb9cea..3bb310cd8994 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.4.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=CMake Modules which are not distributed with CMake but are commonly used by ROS packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cmake_modules
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/cmake_modules/archive/0.4.0.tar.gz -> cmake_modules-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a84c1dd3e42ba593faef43bf9e6b3db
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-9999 b/metadata/md5-cache/dev-ros/cmake_modules-9999
index b23a73751855..1587d04d9cfc 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=CMake Modules which are not distributed with CMake but are commonly used by ROS packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cmake_modules
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a84c1dd3e42ba593faef43bf9e6b3db
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.3-r1 b/metadata/md5-cache/dev-ros/collada_parser-1.12.3-r1
index ea0219758a1c..363580960997 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.3-r1
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_parser
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp d
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32d5c83c77935f1ccaa5816764ff2531
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.4 b/metadata/md5-cache/dev-ros/collada_parser-1.12.4
index 98259e846220..a5d43c178d96 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.4
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_parser
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp d
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32d5c83c77935f1ccaa5816764ff2531
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.5 b/metadata/md5-cache/dev-ros/collada_parser-1.12.5
index e3b837d71c16..2b8b626874ad 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.5
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_parser
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/roscpp d
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32d5c83c77935f1ccaa5816764ff2531
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index fe3d1068f9cf..9b94af7c7da9 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/urdf_parser_plugin dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/urdf_parser_plugin dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ parser for the Collada robot description format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_parser
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/urdf_parser_plugin dev-ros/roscpp dev-ros/class_loader dev-libs/urdfdom_headers dev-libs/collada-dom dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=188e2cfd05f8fbb51693c59b9089ae0e
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.3-r2 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.3-r2
index c4e98fe1bfdd..e74d521b12af 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.3-r2
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.3-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_urdf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bb878dc8cc60991247efa02ff248859a
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.4 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.4
index 5e0c9e051c11..43ff7098d757 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.4
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_urdf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0e62f6012615fe0578f5fc0a0e543ff
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.5 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.5
index a9fb2e7d61c4..fddbf1453737 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.5
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever >=dev-ros/urdf-1.12.3-r1 dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-libs/urdfdom-1:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_urdf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0e62f6012615fe0578f5fc0a0e543ff
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index e504a856e613..8902bb15f8ae 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -1,5 +1,5 @@
 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/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/collada_urdf
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96a6703d99b829e2e32fd35b25ec5bc9
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.0 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.0
index af2d45c8bb08..214d3e9dd4bb 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.0
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Combined Robot HW class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp dev-u
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c23c4b2d4bce09de1a6b6f39f79e44ed
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.1 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.1
index 46c85a0a9d09..8744cc8e88a6 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Combined Robot HW class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp dev-u
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c23c4b2d4bce09de1a6b6f39f79e44ed
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.2 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.2
index 1c01acdfb182..2ce6a36a24ca 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Combined Robot HW class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp dev-u
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c23c4b2d4bce09de1a6b6f39f79e44ed
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.3 b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.3
index a32e9df9ec97..7175d8758d81 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.3
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Combined Robot HW class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp dev-u
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c23c4b2d4bce09de1a6b6f39f79e44ed
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw-9999 b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
index 6ef77705d2bd..6ca08e60c2e8 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Combined Robot HW class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/hardware_interface-0.11 dev-ros/pluginlib dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c23c4b2d4bce09de1a6b6f39f79e44ed
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.0 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.0
index bedf86365765..634ce395ea37 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.0
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.0
@@ -1,5 +1,5 @@
 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 test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Combined Robot HW class tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8fa7606ac554e4e2d6e025f278d026c
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.1 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.1
index 6d723e9e06e4..d12ad7b9568a 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.1
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.1
@@ -1,5 +1,5 @@
 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 test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Combined Robot HW class tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8fa7606ac554e4e2d6e025f278d026c
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.2 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.2
index 6d9ae1d4aadc..721ee1513507 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.2
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.2
@@ -1,5 +1,5 @@
 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 test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Combined Robot HW class tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8fa7606ac554e4e2d6e025f278d026c
diff --git a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.3 b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.3
index f2416f738fec..4072fe1e3be9 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.3
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.3
@@ -1,5 +1,5 @@
 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 test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Combined Robot HW class tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8fa7606ac554e4e2d6e025f278d026c
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 883867faf746..4c759674f001 100644
--- a/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
+++ b/metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
@@ -1,5 +1,5 @@
 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 test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/combined_robot_hw dev-ros/controller_manager dev-ros/controller_manager_tests dev-ros/hardware_interface dev-ros/roscpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Combined Robot HW class tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/combined_robot_hw_tests
@@ -8,5 +8,5 @@ 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8fa7606ac554e4e2d6e025f278d026c
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.2-r1 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.2-r1
index 660633fc682e..663f1b621dd1 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.2-r1
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/tf media-libs/opencv sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/tf media-libs/opencv sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending depth images using PNG compression
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_depth_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.2.tar.gz -> image_transport_plugins-1.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2696b62063130cbc1ab416673197fa9e
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.3 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.3
index d2a56ae4f839..78e89c29fccd 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.3
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending depth images using PNG compression
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_depth_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.3.tar.gz -> image_transport_plugins-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7177039c6a997c46a41fd3cf1cbc2f44
diff --git a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5 b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5
index 5399fc3c0cbd..72b69b36324b 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending depth images using PNG compression
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_depth_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9ba5a14105395c3681ef75a539354e9
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 74d58a72d7c0..43ed26f98514 100644
--- a/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_depth_image_transport-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending depth images using PNG compression
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_depth_image_transport
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7177039c6a997c46a41fd3cf1cbc2f44
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.2-r1 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.2-r1
index 0d058a2101d6..56acb798600e 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.2-r1
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.2-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/tf media-libs/opencv sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/tf media-libs/opencv sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending images encoded as JPEG or PNG
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.2.tar.gz -> image_transport_plugins-1.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9cb35d9d375f51b2c16b8de24eed42fb
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.3 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.3
index b6fd5a1f1b74..038b3da7b602 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.3
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending images encoded as JPEG or PNG
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.3.tar.gz -> image_transport_plugins-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cfafe66899374d010b057f95503f75e
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5 b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5
index c24cd3b328e7..5fc63f9949d6 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending images encoded as JPEG or PNG
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8bf15680ccf4d2f178ca31795258037a
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
index dd12e196b13b..c9340526cd5b 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Plugin to image_transport for transparently sending images encoded as JPEG or PNG
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/compressed_image_transport
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6cfafe66899374d010b057f95503f75e
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.3.1 b/metadata/md5-cache/dev-ros/control_msgs-1.3.1
index e8d9bf8852b9..5aa8032b8aa2 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.3.1
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/control_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_msgs/archive/1.3.1.tar.gz -> control_msgs-1.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=addc5ac79fb95eef7ffa53744bf1cfb0
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.4.0 b/metadata/md5-cache/dev-ros/control_msgs-1.4.0
index 1d9503f2bde1..284b33c12724 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-1.4.0
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/control_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_msgs/archive/1.4.0.tar.gz -> control_msgs-1.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=addc5ac79fb95eef7ffa53744bf1cfb0
diff --git a/metadata/md5-cache/dev-ros/control_msgs-9999 b/metadata/md5-cache/dev-ros/control_msgs-9999
index e325a47319e7..2a838dbf8a86 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Base messages and actions useful for controlling robots
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/control_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=addc5ac79fb95eef7ffa53744bf1cfb0
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.14.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
index 8e6ccf83a8c7..e1bbd507126f 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
@@ -1,5 +1,5 @@
 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/control_toolbox
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-li
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.14.0.tar.gz -> control_toolbox-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a87720c0f04222059e5022a444c8158f
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.15.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
index 7dc6cf34173d..c033c5a8cf4d 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
@@ -1,5 +1,5 @@
 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/control_toolbox
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-li
 SLOT=0
 SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.15.0.tar.gz -> control_toolbox-1.15.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=efd78333b26753bc36d255a6405c6d06
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index 46ac0bd483ca..e702d9b289b3 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -1,5 +1,5 @@
 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Modules that are useful across all controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/control_toolbox
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a87720c0f04222059e5022a444c8158f
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.10.0 b/metadata/md5-cache/dev-ros/controller_interface-0.10.0
index a0ee8cc0ad1e..b4f6c0c83858 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.10.0
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a62c2bb61254c2c2a7140ee5010b344
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.10.1 b/metadata/md5-cache/dev-ros/controller_interface-0.10.1
index d2547e1c3865..797f9acf40ae 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.10.1
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a62c2bb61254c2c2a7140ee5010b344
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.11.0 b/metadata/md5-cache/dev-ros/controller_interface-0.11.0
index ff83fb533af8..467b8ea72939 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.11.0
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c7a1892a2ff8e3c6f39edd2c08d6034
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.11.1 b/metadata/md5-cache/dev-ros/controller_interface-0.11.1
index f79bdc78bc86..16e290c7f888 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.11.1
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c7a1892a2ff8e3c6f39edd2c08d6034
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.11.2 b/metadata/md5-cache/dev-ros/controller_interface-0.11.2
index 19546cf92f20..6965feda4b13 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.11.2
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c7a1892a2ff8e3c6f39edd2c08d6034
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.11.3 b/metadata/md5-cache/dev-ros/controller_interface-0.11.3
index 79619c9bff2a..b59cf93cac2f 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.11.3
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c7a1892a2ff8e3c6f39edd2c08d6034
diff --git a/metadata/md5-cache/dev-ros/controller_interface-0.9.3 b/metadata/md5-cache/dev-ros/controller_interface-0.9.3
index 5f8ceea9e89f..c4a5d4927d7f 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-0.9.3
+++ b/metadata/md5-cache/dev-ros/controller_interface-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/cat
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a62c2bb61254c2c2a7140ee5010b344
diff --git a/metadata/md5-cache/dev-ros/controller_interface-9999 b/metadata/md5-cache/dev-ros/controller_interface-9999
index 5279f0fca889..0fdb6603aa31 100644
--- a/metadata/md5-cache/dev-ros/controller_interface-9999
+++ b/metadata/md5-cache/dev-ros/controller_interface-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Interface base class for controllers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_interface
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-ros/pluginlib dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a62c2bb61254c2c2a7140ee5010b344
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.10.0 b/metadata/md5-cache/dev-ros/controller_manager-0.10.0
index 99189a48964a..0e173a36cc36 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.10.0
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b5e9065ee1132a63bc69f3c2ebc6bbf
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.10.1 b/metadata/md5-cache/dev-ros/controller_manager-0.10.1
index 3251791b9459..342d8fc3e21f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.10.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b5e9065ee1132a63bc69f3c2ebc6bbf
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.11.0 b/metadata/md5-cache/dev-ros/controller_manager-0.11.0
index 64724ae233e7..fcfb332ddb38 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.11.0
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918937d0b41cf97d1211909176fe94f3
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.11.1 b/metadata/md5-cache/dev-ros/controller_manager-0.11.1
index 159702d7989a..c705d6ab70fd 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.11.1
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918937d0b41cf97d1211909176fe94f3
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.11.2 b/metadata/md5-cache/dev-ros/controller_manager-0.11.2
index 494cdab99111..e1bfdddcf4cd 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.11.2
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918937d0b41cf97d1211909176fe94f3
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.11.3 b/metadata/md5-cache/dev-ros/controller_manager-0.11.3
index 3c5fc659415f..ee13d44d55be 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.11.3
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ro
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918937d0b41cf97d1211909176fe94f3
diff --git a/metadata/md5-cache/dev-ros/controller_manager-0.9.3 b/metadata/md5-cache/dev-ros/controller_manager-0.9.3
index 1625162d22b1..208d3c4f6db0 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-0.9.3
+++ b/metadata/md5-cache/dev-ros/controller_manager-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_interface dev-ros/controller_manager_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/hardware_interface dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface dev-ros/controller_manager_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/hardware_interface dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_interface dev-ros/controller_manager_msgs[ros_message
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9118661e525c04d0c5739e6cce2b19d3
diff --git a/metadata/md5-cache/dev-ros/controller_manager-9999 b/metadata/md5-cache/dev-ros/controller_manager-9999
index 3dcd7ce12e73..370b5c10aba2 100644
--- a/metadata/md5-cache/dev-ros/controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/controller_interface >=dev-ros/controller_manager_msgs-0.10.0[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-ros/hardware_interface-0.10.0 dev-ros/realtime_tools dev-ros/pluginlib dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4b5e9065ee1132a63bc69f3c2ebc6bbf
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.0 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.0
index 824c9042fa2b..a56fa703d43b 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.0
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f22fdd6bb2307b51ac9bc1b3fc269a83
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.1
index 8d637bb0fc4d..7cee896f7098 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f22fdd6bb2307b51ac9bc1b3fc269a83
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.0 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.0
index 9edc213db1dd..8ef001c5454c 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.0
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=171b70a3b08e4d9438546a497eea71fc
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.1 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.1
index dfba8be3674c..cafdfd61d129 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=171b70a3b08e4d9438546a497eea71fc
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.2 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.2
index 0c03f41af004..cea8699dac7a 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=171b70a3b08e4d9438546a497eea71fc
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.3 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.3
index d6f159fc7bca..a7cbbaff5862 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.3
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=171b70a3b08e4d9438546a497eea71fc
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.9.3 b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.9.3
index 42bac768fb91..a68df691c0d5 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-0.9.3
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f22fdd6bb2307b51ac9bc1b3fc269a83
diff --git a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999 b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
index 4bb27a940012..8a2a2f1e8587 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=The controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f22fdd6bb2307b51ac9bc1b3fc269a83
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.0 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.0
index 1775e1732a3d..3e8a0e5fe04f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.0
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f447faf6f522eaf3e585c0ad03d47dcc
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.1
index 565a1d165b5c..d7b1e0607549 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e07cbf3373b2c0a6a350328a67ce6cd5
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.0 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.0
index 66bdf8f8a1ca..73d6588ce0a4 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.0
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c04baa88d8eb52370532db781b3325f
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.1 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.1
index df10be3e7374..47a5ce9bd8c5 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.1
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c04baa88d8eb52370532db781b3325f
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.2 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.2
index fcb4434a9143..2b1546c29ffb 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.2
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c04baa88d8eb52370532db781b3325f
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.3 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.3
index 1205c1acc112..3119c2598f7c 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.3
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c04baa88d8eb52370532db781b3325f
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-0.9.3 b/metadata/md5-cache/dev-ros/controller_manager_tests-0.9.3
index ae2844f22049..0a52da36d57f 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-0.9.3
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f447faf6f522eaf3e585c0ad03d47dcc
diff --git a/metadata/md5-cache/dev-ros/controller_manager_tests-9999 b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
index 49a3e42c63d3..30938fa745cd 100644
--- a/metadata/md5-cache/dev-ros/controller_manager_tests-9999
+++ b/metadata/md5-cache/dev-ros/controller_manager_tests-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for the controller manager
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/controller_manager_tests
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/controller_interface dev-ros/control_toolbox dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e07cbf3373b2c0a6a350328a67ce6cd5
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
index 658531f8936b..ccb503069ee7 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/convex_decomposition
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.10.tar.gz -> convex_decomposition-0.1.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92d5a72168e26d44415420b784aa7c14
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
index a460fa39bdfa..1d36f93a8a09 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/convex_decomposition
@@ -10,5 +10,5 @@ RDEPEND=app-arch/unzip dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.11.tar.gz -> convex_decomposition-0.1.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92d5a72168e26d44415420b784aa7c14
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-9999 b/metadata/md5-cache/dev-ros/convex_decomposition-9999
index e838904ebcca..c2f66693a8e4 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/unzip >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=app-arch/unzip >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convex Decomposition Tool for Robot Model
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/convex_decomposition
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=app-arch/unzip dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=92d5a72168e26d44415420b784aa7c14
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-1.14.0-r1 b/metadata/md5-cache/dev-ros/costmap_2d-1.14.0-r1
index 9143cd7e753b..8aed8284696a 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/costmap_2d-1.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/costmap_2d
@@ -11,5 +11,5 @@ REQUIRED_USE=ros_messages_cxx
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d185efb5ea6a24a65f46de2ea9ac01a
diff --git a/metadata/md5-cache/dev-ros/costmap_2d-9999 b/metadata/md5-cache/dev-ros/costmap_2d-9999
index aa03985bf8be..14eebc569ee4 100644
--- a/metadata/md5-cache/dev-ros/costmap_2d-9999
+++ b/metadata/md5-cache/dev-ros/costmap_2d-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/laser_geometry dev-ros/message_filters dev-ros/nav_msgs dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/voxel_grid dev-cpp/eigen:3 sci-libs/pcl:= dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Creates a 2D costmap from sensor data
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/costmap_2d
@@ -9,5 +9,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 REQUIRED_USE=ros_messages_cxx
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d185efb5ea6a24a65f46de2ea9ac01a
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.5.6 b/metadata/md5-cache/dev-ros/cpp_common-0.5.6
index b9897ddbbd96..178e95237cba 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.5.6
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cpp_common
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] dev-util/catkin dev-py
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca855cdebbcc94933e4e49d15930f4e9
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.5.7 b/metadata/md5-cache/dev-ros/cpp_common-0.5.7
index a7a190da804d..efa1435645d9 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.5.7
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cpp_common
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] dev-util/catkin dev-py
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca855cdebbcc94933e4e49d15930f4e9
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.0 b/metadata/md5-cache/dev-ros/cpp_common-0.6.0
index e1678b63a216..ef10ca94c140 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.0
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cpp_common
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] dev-util/catkin dev-py
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca855cdebbcc94933e4e49d15930f4e9
diff --git a/metadata/md5-cache/dev-ros/cpp_common-0.6.1 b/metadata/md5-cache/dev-ros/cpp_common-0.6.1
index 58ece59cd921..d83b474c0b8d 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-0.6.1
+++ b/metadata/md5-cache/dev-ros/cpp_common-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cpp_common
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] dev-util/catkin dev-py
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=237d40b5b24d2f939ed35de5fe80ad02
diff --git a/metadata/md5-cache/dev-ros/cpp_common-9999 b/metadata/md5-cache/dev-ros/cpp_common-9999
index 3f4aaf3a8646..a6f35bc0e87c 100644
--- a/metadata/md5-cache/dev-ros/cpp_common-9999
+++ b/metadata/md5-cache/dev-ros/cpp_common-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ code for doing things that are not necessarily ROS related
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cpp_common
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/console_bridge dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ca855cdebbcc94933e4e49d15930f4e9
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.0
index e5b10daf68a5..9f93cf19ba13 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.0
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[thread
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.0.tar.gz -> vision_opencv-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60f46a22671da74d9b4dc3b4401207d5
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.1 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.1
index 7ac4c92ff635..27704a51ec57 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.1
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[thread
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.1.tar.gz -> vision_opencv-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60f46a22671da74d9b4dc3b4401207d5
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.2 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.2
index 8290c4f1d2ec..edc7b91da004 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.2
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[thread
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.2.tar.gz -> vision_opencv-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60f46a22671da74d9b4dc3b4401207d5
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.3 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.3
index ea780becdc19..cd586277cf73 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.3
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[thread
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60f46a22671da74d9b4dc3b4401207d5
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index 3387285f21ba..887793fd964f 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/cv_bridge
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosconsole media-libs/opencv[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=60f46a22671da74d9b4dc3b4401207d5
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.14 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.14
index 908a9c9f47d3..610068f9dfe6 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.14
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depth_image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16708847397b33d7642b22435850560d
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.15 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.15
index 293f001201ef..bb975ac18155 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.15
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depth_image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16708847397b33d7642b22435850560d
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.16 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.16
index 0757dec22e3b..f254a1b8381f 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.16
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depth_image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16708847397b33d7642b22435850560d
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.18 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.18
index 0979d6fc2259..639ea87b3f0c 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.18
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depth_image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935d91b439a35f820afcb720d85f23c4
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.19 b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.19
index 82f133ab1495..2ce4250a5a36 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-1.12.19
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-1.12.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depth_image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=935d91b439a35f820afcb720d85f23c4
diff --git a/metadata/md5-cache/dev-ros/depth_image_proc-9999 b/metadata/md5-cache/dev-ros/depth_image_proc-9999
index d15d6b27d981..5d9be2733c6c 100644
--- a/metadata/md5-cache/dev-ros/depth_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/depth_image_proc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelets for processing depth images such as those produced by OpenNI camera
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depth_image_proc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/eigen_conversions dev-ros/image_geometry dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16708847397b33d7642b22435850560d
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r1 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r1
index ac41f3377d18..77e5b4eb6749 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r1
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depthimage_to_laserscan
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,
 SLOT=0
 SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.7.tar.gz -> depthimage_to_laserscan-1.0.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8498e79125e1e1ce027746c7ba5ec71
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index 15095c38443d..d18bfa9388da 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/depthimage_to_laserscan
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a8498e79125e1e1ce027746c7ba5ec71
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.10
index 4a7ed65986ba..40bbcdaa64b3 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/r
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56d3c05f381422dd5e018d4724e88e0c
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.9
index e6367380d9ff..12f1f2186a60 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-1.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/r
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fe4fcb3eefef091106f2b91539d15d4
diff --git a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
index 5676ba6c2d72..5117c55a75fd 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_aggregator-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Aggregates ROS diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_aggregator
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-ros/xmlrpcpp dev-ros/bondcpp dev-libs/boost:= dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fe4fcb3eefef091106f2b91539d15d4
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10
index 493534ef122d..2f948d4faa65 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_analysis
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a6169ed7111b0688ad010d970cf727f
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8
index 12952d72b869..1c7e11b210b2 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_analysis
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5b21c22ca50989bcac2097ad1ec97df
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9
index 61a07b44306b..dbd3d1d7ed38 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-1.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_analysis
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5b21c22ca50989bcac2097ad1ec97df
diff --git a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999 b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
index b1312707bdff..57cb97ae51c3 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_analysis-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Converts diagnostics data into a series of CSV files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_analysis
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c5b21c22ca50989bcac2097ad1ec97df
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10
index 2c19201b9001..2c4fd3c9c26e 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_common_diagnostics
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5a333b1cce2577ee5bb3aaf1e17a68d8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8
index 64d4dff5abc5..d5c8ef5d8ad4 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_common_diagnostics
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18ea9c3ac801b4aa0066b982a4948ace
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
index 61699176d125..551af6f20152 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_common_diagnostics
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18ea9c3ac801b4aa0066b982a4948ace
diff --git a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999 b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
index 8aa7da7bcaab..45aa9d1b07aa 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generic nodes for monitoring a linux host
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_common_diagnostics
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_updater[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/hddtemp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=18ea9c3ac801b4aa0066b982a4948ace
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.3 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.3
index 5d20b4b73fde..ca52f596f3ec 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=954583e8fa90ceb89072c6667690c33b
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.4 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.4
index ba7ce6fc88ae..b0e98be4d00e 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=954583e8fa90ceb89072c6667690c33b
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5 b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
index 36bcb9a23106..471ab71be729 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5769362bde73145d40d9ab67c3cf4d3b
diff --git a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999 b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
index 52d0c9f69a99..4079da83a375 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Standardized interface for the diagnostic and runtime monitoring systems in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=954583e8fa90ceb89072c6667690c33b
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10
index 07121ebb7a57..2e567b63a49b 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools for updating diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_updater
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61e79a5c440eeaabda4702b6fc4c66f6
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8
index 4fc541eabd84..b76124217598 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools for updating diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_updater
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dfb4ce80f2b03be4ab6de2473a770a8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9 b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9
index c78e6abd6267..b8385c682f05 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-1.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools for updating diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_updater
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),pytho
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dfb4ce80f2b03be4ab6de2473a770a8
diff --git a/metadata/md5-cache/dev-ros/diagnostic_updater-9999 b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
index 20e9779f34cb..98cec05f4977 100644
--- a/metadata/md5-cache/dev-ros/diagnostic_updater-9999
+++ b/metadata/md5-cache/dev-ros/diagnostic_updater-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools for updating diagnostics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/diagnostic_updater
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dfb4ce80f2b03be4ab6de2473a770a8
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 8a4246054a54..197f8ba9000f 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/driver_base
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,python_tar
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e785bbdb3f7cbafafb7ddd3767e6127
diff --git a/metadata/md5-cache/dev-ros/driver_base-9999 b/metadata/md5-cache/dev-ros/driver_base-9999
index 9db6fd21b585..be4a02afa15d 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/driver_base
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8e785bbdb3f7cbafafb7ddd3767e6127
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-1.14.0-r1 b/metadata/md5-cache/dev-ros/dwa_local_planner-1.14.0-r1
index c41296d8e4c2..fc2c3f4c0f31 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-1.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dwa_local_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigur
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da9b13692b3b90043f1476c53d246c96
diff --git a/metadata/md5-cache/dev-ros/dwa_local_planner-9999 b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
index a83767b0efd5..2e26b05bed7d 100644
--- a/metadata/md5-cache/dev-ros/dwa_local_planner-9999
+++ b/metadata/md5-cache/dev-ros/dwa_local_planner-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Dynamic Window Approach to local robot navigation on a plane
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dwa_local_planner
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/base_local_planner dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/pcl_conversions dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da9b13692b3b90043f1476c53d246c96
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.43 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.43
index e4ee8b2cd6cc..efcb1ae00824 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.43
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.43
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dynamic_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.43.tar.gz -> dynamic_reconfigure-1.5.43.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce8c6b6405be88fde577281f6c6e1bde
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.44 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.44
index 9434728dbbf2..3331853e9cf6 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.44
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.44
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dynamic_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.44.tar.gz -> dynamic_reconfigure-1.5.44.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d0a9baed1d40e6aadbfe1f8ecaf03b2
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.45 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.45
index e768999e5556..ad1d20265f04 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.45
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.45
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dynamic_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.45.tar.gz -> dynamic_reconfigure-1.5.45.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d0a9baed1d40e6aadbfe1f8ecaf03b2
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46
index 39bfe698b3e9..c912535e404b 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.46
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dynamic_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.46.tar.gz -> dynamic_reconfigure-1.5.46.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d0a9baed1d40e6aadbfe1f8ecaf03b2
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index 3e740ee9ca80..f0af11fa20b1 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/dynamic_reconfigure
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce8c6b6405be88fde577281f6c6e1bde
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-1.11.7 b/metadata/md5-cache/dev-ros/eigen_conversions-1.11.7
index fbd817d49def..9413ba63e597 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.11.7
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.11.7
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+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 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_conversions
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_c
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.7.tar.gz -> geometry-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb7ebe6d053d096f0c7f23ce28f1b0a0
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-1.11.8 b/metadata/md5-cache/dev-ros/eigen_conversions-1.11.8
index be5809f7c1ef..399abd9697dc 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-1.11.8
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-1.11.8
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+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 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_conversions
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/geometry_msgs[ros_messages_c
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.8.tar.gz -> geometry-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb7ebe6d053d096f0c7f23ce28f1b0a0
diff --git a/metadata/md5-cache/dev-ros/eigen_conversions-9999 b/metadata/md5-cache/dev-ros/eigen_conversions-9999
index 62fe5f047955..36412742850d 100644
--- a/metadata/md5-cache/dev-ros/eigen_conversions-9999
+++ b/metadata/md5-cache/dev-ros/eigen_conversions-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Conversion functions between Eigen and KDL and Eigen and geometry_msgs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_conversions
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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 dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb7ebe6d053d096f0c7f23ce28f1b0a0
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
index 7721686077e4..6ca12531010e 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_stl_containers
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.4.tar.gz -> eigen_stl_containers-0.1.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbd8c2d205b36108c0fee097ebfdc0ba
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
index 07defd9652e3..e7d6af926060 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_stl_containers
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.5.tar.gz -> eigen_stl_containers-0.1.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbd8c2d205b36108c0fee097ebfdc0ba
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
index 838cc9a6f251..73089cc5828e 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_stl_containers
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.6.tar.gz -> eigen_stl_containers-0.1.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4f6011373fdc6ca8a4203c5dd3237f1
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999 b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
index b45980bf66b5..3aba6eb794ff 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/eigen_stl_containers
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dbd8c2d205b36108c0fee097ebfdc0ba
diff --git a/metadata/md5-cache/dev-ros/fake_localization-1.14.0-r1 b/metadata/md5-cache/dev-ros/fake_localization-1.14.0-r1
index ed40c91501f8..524c58fff5a1 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/fake_localization-1.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/fake_localization
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targ
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79c42f0a313536fa296bf672224c6c44
diff --git a/metadata/md5-cache/dev-ros/fake_localization-9999 b/metadata/md5-cache/dev-ros/fake_localization-9999
index 8a2270e6f280..541a3d1612a3 100644
--- a/metadata/md5-cache/dev-ros/fake_localization-9999
+++ b/metadata/md5-cache/dev-ros/fake_localization-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A ROS node that simply forwards odometry information
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/fake_localization
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79c42f0a313536fa296bf672224c6c44
diff --git a/metadata/md5-cache/dev-ros/filters-1.7.4-r1 b/metadata/md5-cache/dev-ros/filters-1.7.4-r1
index 5ca24b29fe96..bba45babc5c6 100644
--- a/metadata/md5-cache/dev-ros/filters-1.7.4-r1
+++ b/metadata/md5-cache/dev-ros/filters-1.7.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/pluginlib dev-util/catk
 SLOT=0
 SRC_URI=https://github.com/ros/filters/archive/1.7.4.tar.gz -> filters-1.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=209951dcea2f6191f24de7b332e25fe5
diff --git a/metadata/md5-cache/dev-ros/filters-9999 b/metadata/md5-cache/dev-ros/filters-9999
index d344b24a03b5..ef1f3cbf7ebd 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/filters
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-ros/pluginlib dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=209951dcea2f6191f24de7b332e25fe5
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.1 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.1
index 0cf9e47974e4..5f8585b8fed0 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.1
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.1.tar.gz -> gazebo_ros_pkgs-2.5.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e275bd02058b2ac7a5fbb97ea351d13
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.2 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.2
index 35ccbb0e59e0..63b2979d4f37 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.2
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.2.tar.gz -> gazebo_ros_pkgs-2.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e275bd02058b2ac7a5fbb97ea351d13
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.3 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.3
index 9aac01020357..024e5d61821f 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.3
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.3.tar.gz -> gazebo_ros_pkgs-2.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e275bd02058b2ac7a5fbb97ea351d13
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.6 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.6
index 5c22e4b5a56a..561188cdbc10 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.6
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.6.tar.gz -> gazebo_ros_pkgs-2.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e275bd02058b2ac7a5fbb97ea351d13
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.7 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.7
index 3d9535ed4fa4..1e036cd5dd96 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.7
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.7.tar.gz -> gazebo_ros_pkgs-2.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f0eaebb180bffd79302bb6b48ec93d4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.0 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.0
index 9758f5f90066..4e7e018a6595 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.0
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.0.tar.gz -> gazebo_ros_pkgs-2.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f0eaebb180bffd79302bb6b48ec93d4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.1 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.1
index a6e0ea71686b..74482b3fb3f6 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.1
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.1.tar.gz -> gazebo_ros_pkgs-2.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f0eaebb180bffd79302bb6b48ec93d4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-9999 b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
index 74415f28415f..b6f001356228 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e275bd02058b2ac7a5fbb97ea351d13
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.2 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.2
index 7fb5ce75ebad..92d4bbbd5b82 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.2
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.2.tar.gz -> gazebo_ros_pkgs-2.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d589c322aac5c0ff93f3ef3a5cc1021
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.3 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.3
index 9b4cd2b733e8..5a61dd1705a3 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.3
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.3.tar.gz -> gazebo_ros_pkgs-2.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d589c322aac5c0ff93f3ef3a5cc1021
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.6 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.6
index cc8f201def15..d0a1b7969bb3 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.6
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.6.tar.gz -> gazebo_ros_pkgs-2.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d589c322aac5c0ff93f3ef3a5cc1021
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.7 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.7
index b4384202edae..d96b20244229 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.7
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.7.tar.gz -> gazebo_ros_pkgs-2.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d3d86e18d79f832515c3095d900bbab
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.0 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.0
index efbf0d12e00f..fc78e3051b91 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.0
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.0.tar.gz -> gazebo_ros_pkgs-2.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d3d86e18d79f832515c3095d900bbab
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.1 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.1
index 35c5eb9d7958..38beb65c5846 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.1
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy de
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.1.tar.gz -> gazebo_ros_pkgs-2.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d3d86e18d79f832515c3095d900bbab
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 6fb482ada097..48ee7dd5ab23 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
@@ -8,5 +8,5 @@ LICENSE=BSD Apache-2.0
 RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure dev-ros/driver_base dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d589c322aac5c0ff93f3ef3a5cc1021
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.1 b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.1
index 475ecd7c5feb..383d84046a84 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.1.tar.gz -> gazebo_ros_pkgs-2.5.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76b43759650da0bd980ad02ae4eca54d
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.2 b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.2
index 4af846ceb84c..1a2c48dd5246 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.2
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.2.tar.gz -> gazebo_ros_pkgs-2.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76b43759650da0bd980ad02ae4eca54d
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.3 b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.3
index e0d5e3890d0e..865025b750d6 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.3
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.3.tar.gz -> gazebo_ros_pkgs-2.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76b43759650da0bd980ad02ae4eca54d
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.6 b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.6
index 26b8400803c1..27ef64695446 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.6
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.6.tar.gz -> gazebo_ros_pkgs-2.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76b43759650da0bd980ad02ae4eca54d
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.7 b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.7
index 21f26ed29cdc..e2ae7c4002be 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.5.7
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.7.tar.gz -> gazebo_ros_pkgs-2.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5e5d43bfd61bcb4c51f32f5b5c376aa
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.0 b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.0
index bf3903d8f5af..ebe584a355b5 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.0
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.0.tar.gz -> gazebo_ros_pkgs-2.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5e5d43bfd61bcb4c51f32f5b5c376aa
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.1 b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.1
index e5b3d26653c6..a80ffe191484 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.1.tar.gz -> gazebo_ros_pkgs-2.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5e5d43bfd61bcb4c51f32f5b5c376aa
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index 59b608aa805f..ae46a64f9f5f 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/tinyxml sci-electronics/gazebo dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=76b43759650da0bd980ad02ae4eca54d
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
index e828e7e4debc..147fa130042a 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=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] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=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] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/contro
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.0.tar.gz -> gazebo_ros_pkgs-2.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=269865bb24f63e496e6d2477159d02b7
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.1
index fc5db478d9ff..23e169360a95 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.1
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=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] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=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] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/contro
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.1.tar.gz -> gazebo_ros_pkgs-2.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=269865bb24f63e496e6d2477159d02b7
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index d0e893001865..b9ffe97268f7 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e526b46daa13da72288f15e66b395d56
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.5.3 b/metadata/md5-cache/dev-ros/gencpp-0.5.3
index 2d14168d8952..cc8d8940f171 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.5.3
+++ b/metadata/md5-cache/dev-ros/gencpp-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gencpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.5.3
 SRC_URI=https://github.com/ros/gencpp/archive/0.5.3.tar.gz -> gencpp-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32c32a400ccd5916ba71760da39e34c0
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.5.4 b/metadata/md5-cache/dev-ros/gencpp-0.5.4
index de46f961a91b..6faab5850892 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.5.4
+++ b/metadata/md5-cache/dev-ros/gencpp-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gencpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.5.4
 SRC_URI=https://github.com/ros/gencpp/archive/0.5.4.tar.gz -> gencpp-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32c32a400ccd5916ba71760da39e34c0
diff --git a/metadata/md5-cache/dev-ros/gencpp-0.5.5 b/metadata/md5-cache/dev-ros/gencpp-0.5.5
index b2347c6c0f65..6a3697a97a3c 100644
--- a/metadata/md5-cache/dev-ros/gencpp-0.5.5
+++ b/metadata/md5-cache/dev-ros/gencpp-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gencpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.5.5
 SRC_URI=https://github.com/ros/gencpp/archive/0.5.5.tar.gz -> gencpp-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=578f3609b46d5d929b40785c54be6150
diff --git a/metadata/md5-cache/dev-ros/gencpp-9999 b/metadata/md5-cache/dev-ros/gencpp-9999
index 2d409ae924fa..03437679b2c9 100644
--- a/metadata/md5-cache/dev-ros/gencpp-9999
+++ b/metadata/md5-cache/dev-ros/gencpp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=ROS C++ message definition and serialization generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gencpp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0/9999
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=32c32a400ccd5916ba71760da39e34c0
diff --git a/metadata/md5-cache/dev-ros/geneus-2.2.5 b/metadata/md5-cache/dev-ros/geneus-2.2.5
index 29a1963d6969..7887b26e9f7c 100644
--- a/metadata/md5-cache/dev-ros/geneus-2.2.5
+++ b/metadata/md5-cache/dev-ros/geneus-2.2.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geneus
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/2.2.5
 SRC_URI=https://github.com/jsk-ros-pkg/geneus/archive/2.2.5.tar.gz -> geneus-2.2.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e006abd2fe22564637c75c97e6d05721
diff --git a/metadata/md5-cache/dev-ros/geneus-9999 b/metadata/md5-cache/dev-ros/geneus-9999
index dd43be7afe81..74c681527d69 100644
--- a/metadata/md5-cache/dev-ros/geneus-9999
+++ b/metadata/md5-cache/dev-ros/geneus-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=EusLisp ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geneus
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0/9999
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e006abd2fe22564637c75c97e6d05721
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.15 b/metadata/md5-cache/dev-ros/genlisp-0.4.15
index 755d31ad618f..e5939be790fb 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.15
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genlisp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.4.15
 SRC_URI=https://github.com/ros/genlisp/archive/0.4.15.tar.gz -> genlisp-0.4.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6845d91c5afca3b1f2e7f173afc65c72
diff --git a/metadata/md5-cache/dev-ros/genlisp-0.4.16 b/metadata/md5-cache/dev-ros/genlisp-0.4.16
index 7344f6072e5a..ca78516d4a08 100644
--- a/metadata/md5-cache/dev-ros/genlisp-0.4.16
+++ b/metadata/md5-cache/dev-ros/genlisp-0.4.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genlisp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.4.16
 SRC_URI=https://github.com/ros/genlisp/archive/0.4.16.tar.gz -> genlisp-0.4.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d7921f28ab682763fa8671b25c58e884
diff --git a/metadata/md5-cache/dev-ros/genlisp-9999 b/metadata/md5-cache/dev-ros/genlisp-9999
index 58e3ab3740fd..251ca8264df8 100644
--- a/metadata/md5-cache/dev-ros/genlisp-9999
+++ b/metadata/md5-cache/dev-ros/genlisp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Common-Lisp ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genlisp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0/9999
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6845d91c5afca3b1f2e7f173afc65c72
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.6 b/metadata/md5-cache/dev-ros/genmsg-0.5.6
index 215b4a8c42b9..c137df77372b 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.6
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python library for generating ROS message and service data structures for various languages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/genmsg/archive/0.5.6.tar.gz -> genmsg-0.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=afe0fb2026e0f552993591026778f49a
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.7 b/metadata/md5-cache/dev-ros/genmsg-0.5.7
index fa7e5f33ae91..f37604627785 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.7
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python library for generating ROS message and service data structures for various languages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/genmsg/archive/0.5.7.tar.gz -> genmsg-0.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=afe0fb2026e0f552993591026778f49a
diff --git a/metadata/md5-cache/dev-ros/genmsg-0.5.8 b/metadata/md5-cache/dev-ros/genmsg-0.5.8
index 853518a4f54d..01d4b2575c02 100644
--- a/metadata/md5-cache/dev-ros/genmsg-0.5.8
+++ b/metadata/md5-cache/dev-ros/genmsg-0.5.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python library for generating ROS message and service data structures for various languages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/genmsg/archive/0.5.8.tar.gz -> genmsg-0.5.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=63c2304f97153ed337371f0e95180542
diff --git a/metadata/md5-cache/dev-ros/genmsg-9999 b/metadata/md5-cache/dev-ros/genmsg-9999
index 2d1963350b62..09af74f49103 100644
--- a/metadata/md5-cache/dev-ros/genmsg-9999
+++ b/metadata/md5-cache/dev-ros/genmsg-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python library for generating ROS message and service data structures for various languages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genmsg
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=afe0fb2026e0f552993591026778f49a
diff --git a/metadata/md5-cache/dev-ros/gennodejs-1.0.3 b/metadata/md5-cache/dev-ros/gennodejs-1.0.3
index fcbd0c377e64..6b3514c2e5ed 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-1.0.3
+++ b/metadata/md5-cache/dev-ros/gennodejs-1.0.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/1.0.3
 SRC_URI=https://github.com/RethinkRobotics-opensource/gennodejs/archive/1.0.3.tar.gz -> gennodejs-1.0.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8bb451446e153ba44497ec84c55d6c4
diff --git a/metadata/md5-cache/dev-ros/gennodejs-9999 b/metadata/md5-cache/dev-ros/gennodejs-9999
index abfae3a6fe3c..daa6e0436b67 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Javascript ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
@@ -8,5 +8,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0/9999
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=680fa0db6f46a48987c7f94158b7f265
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.2 b/metadata/md5-cache/dev-ros/genpy-0.6.2
index 1a55ac65948f..126307448978 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.2
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.6.2
 SRC_URI=https://github.com/ros/genpy/archive/0.6.2.tar.gz -> genpy-0.6.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40f3906ba72234fbcdc4f8ce900fb24a
diff --git a/metadata/md5-cache/dev-ros/genpy-0.6.3 b/metadata/md5-cache/dev-ros/genpy-0.6.3
index 00f8ff8e6442..860736b4c215 100644
--- a/metadata/md5-cache/dev-ros/genpy-0.6.3
+++ b/metadata/md5-cache/dev-ros/genpy-0.6.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 SLOT=0/0.6.3
 SRC_URI=https://github.com/ros/genpy/archive/0.6.3.tar.gz -> genpy-0.6.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40f3906ba72234fbcdc4f8ce900fb24a
diff --git a/metadata/md5-cache/dev-ros/genpy-9999 b/metadata/md5-cache/dev-ros/genpy-9999
index 016a9c6286d2..2dd74299c735 100644
--- a/metadata/md5-cache/dev-ros/genpy-9999
+++ b/metadata/md5-cache/dev-ros/genpy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Python ROS message and service generators
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/genpy
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0/9999
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40f3906ba72234fbcdc4f8ce900fb24a
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.4.0 b/metadata/md5-cache/dev-ros/geodesy-0.4.0
index 7a26abdb55f4..2a604939d9cf 100644
--- a/metadata/md5-cache/dev-ros/geodesy-0.4.0
+++ b/metadata/md5-cache/dev-ros/geodesy-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyproj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyproj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geodesy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.4.0.tar.gz -> geographic_info-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9053cc4016f65fd1f9dc54025f1832d4
diff --git a/metadata/md5-cache/dev-ros/geodesy-9999 b/metadata/md5-cache/dev-ros/geodesy-9999
index 57a59bafc3d9..6935087e8ebb 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyproj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyproj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geodesy
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyproj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9053cc4016f65fd1f9dc54025f1832d4
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.4.0 b/metadata/md5-cache/dev-ros/geographic_msgs-0.4.0
index 0d55e5de7ad0..92ae93656fc0 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-0.4.0
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geographic_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/geographic_info-0.4.0.tar.gz -> geographic_info-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74e511c24234a5a5a008a77fe57c7eb0
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-9999 b/metadata/md5-cache/dev-ros/geographic_msgs-9999
index bff69ddf8472..8854058ae0e8 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=ROS messages for Geographic Information Systems
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geographic_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74e511c24234a5a5a008a77fe57c7eb0
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.1 b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.1
index 8092ea0173ba..d4e2f77ead55 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.1
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.1
@@ -1,5 +1,5 @@
 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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometric_shapes
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.5.1.tar.gz -> geometric_shapes-0.5.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a95f675d11141626d3fd65c9eef12071
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.2 b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.2
index 0bf7ee61144c..c3b3acc62980 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.5.2
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.5.2
@@ -1,5 +1,5 @@
 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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometric_shapes
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-
 SLOT=0
 SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.5.2.tar.gz -> geometric_shapes-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a95f675d11141626d3fd65c9eef12071
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index b58fa436ea14..e446db471c02 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -1,5 +1,5 @@
 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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Generic definitions of geometric shapes and bodies
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometric_shapes
@@ -8,5 +8,5 @@ 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-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a95f675d11141626d3fd65c9eef12071
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.3 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.3
index b112fff0e659..ea0b524a8bc6 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometry_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4b177fe3d245e35ae75bc3734a20a5a
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.4 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.4
index 6026ab3ab572..a84d1ae6eca2 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometry_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4b177fe3d245e35ae75bc3734a20a5a
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5 b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
index 98b482201413..c613e2dfdcf6 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometry_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02b4b6bec0921bb999128c9a2fdbe469
diff --git a/metadata/md5-cache/dev-ros/geometry_msgs-9999 b/metadata/md5-cache/dev-ros/geometry_msgs-9999
index 6a6853b5481a..1d163c0f430e 100644
--- a/metadata/md5-cache/dev-ros/geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geometry_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for common geometric primitives such as points, vectors, and poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/geometry_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a4b177fe3d245e35ae75bc3734a20a5a
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.13.0 b/metadata/md5-cache/dev-ros/global_planner-1.13.0
index b094ee1952f6..41452675f8d1 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.13.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Path planner library and node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/global_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d262b7cc9ae5277af2d4c10afdc96d4
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.13.1 b/metadata/md5-cache/dev-ros/global_planner-1.13.1
index bb399285c714..1125d3d1a6ac 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.13.1
+++ b/metadata/md5-cache/dev-ros/global_planner-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Path planner library and node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/global_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d262b7cc9ae5277af2d4c10afdc96d4
diff --git a/metadata/md5-cache/dev-ros/global_planner-1.14.0 b/metadata/md5-cache/dev-ros/global_planner-1.14.0
index 9f8fceb35cbc..f312d8fc7fd4 100644
--- a/metadata/md5-cache/dev-ros/global_planner-1.14.0
+++ b/metadata/md5-cache/dev-ros/global_planner-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Path planner library and node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/global_planner
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=161fc0a187e6b2970c522ceb2a8f8026
diff --git a/metadata/md5-cache/dev-ros/global_planner-9999 b/metadata/md5-cache/dev-ros/global_planner-9999
index 71efd01ad573..ea4dc84cb0ad 100644
--- a/metadata/md5-cache/dev-ros/global_planner-9999
+++ b/metadata/md5-cache/dev-ros/global_planner-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Path planner library and node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/global_planner
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/costmap_2d dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/navfn dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d262b7cc9ae5277af2d4c10afdc96d4
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.3.8 b/metadata/md5-cache/dev-ros/gmapping-1.3.8
index cb2aa53617e8..0167d323bb89 100644
--- a/metadata/md5-cache/dev-ros/gmapping-1.3.8
+++ b/metadata/md5-cache/dev-ros/gmapping-1.3.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gmapping
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp de
 SLOT=0
 SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.8.tar.gz -> slam_gmapping-1.3.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5871a0deb82bdca17ccfa39b71811c4a
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 05553a8425c5..ee57a9c73f79 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/rostest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gmapping
@@ -8,5 +8,5 @@ LICENSE=CC-BY-NC-SA-2.5
 RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5871a0deb82bdca17ccfa39b71811c4a
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.10.0 b/metadata/md5-cache/dev-ros/hardware_interface-0.10.0
index 4054345bf361..b9386764f97e 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.10.0
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f818d3abf6c246af252aaa06ae07d7ea
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.10.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.10.1
index 0c16fd34f284..9066c5682414 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.10.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f818d3abf6c246af252aaa06ae07d7ea
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.11.0 b/metadata/md5-cache/dev-ros/hardware_interface-0.11.0
index e42d88777317..75c9aaf61176 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.11.0
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=875953ada0276f817af33fdeee87a32a
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.11.1 b/metadata/md5-cache/dev-ros/hardware_interface-0.11.1
index 35201a88b469..a89302365719 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.11.1
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=875953ada0276f817af33fdeee87a32a
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.11.2 b/metadata/md5-cache/dev-ros/hardware_interface-0.11.2
index 351dd8bbd121..2353ad6c8896 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.11.2
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=875953ada0276f817af33fdeee87a32a
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.11.3 b/metadata/md5-cache/dev-ros/hardware_interface-0.11.3
index 6c42027a71ec..826a48ba95b6 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.11.3
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=875953ada0276f817af33fdeee87a32a
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-0.9.3 b/metadata/md5-cache/dev-ros/hardware_interface-0.9.3
index 9202f6206a60..542450e03d50 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-0.9.3
+++ b/metadata/md5-cache/dev-ros/hardware_interface-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f818d3abf6c246af252aaa06ae07d7ea
diff --git a/metadata/md5-cache/dev-ros/hardware_interface-9999 b/metadata/md5-cache/dev-ros/hardware_interface-9999
index a508e075b674..77065f57b0b9 100644
--- a/metadata/md5-cache/dev-ros/hardware_interface-9999
+++ b/metadata/md5-cache/dev-ros/hardware_interface-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Hardware Interface base class
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hardware_interface
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f818d3abf6c246af252aaa06ae07d7ea
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.3 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.3
index b16b71c4ff84..c24be92e2d6e 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_compressed_map_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hec
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54657ead0c9a5153d28041e402a406bb
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.4 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.4
index 1668c7e1bab5..3993a592fa1b 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_compressed_map_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hec
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54657ead0c9a5153d28041e402a406bb
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
index cbb4bd6a1cdb..26317b1f342a 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_compressed_map_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hec
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3fd1c5bbecd1c89750a44f4809ce1fcf
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 6c178f2b424f..9bc4dbc4386d 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_compressed_map_transport
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=54657ead0c9a5153d28041e402a406bb
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.3 b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.3
index 5acd3e0321b8..7d8350654037 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] de
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=182b9ee020e613fc4e4724e812271597
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.4 b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.4
index 17cc59d6f9bf..5f1ae9fc3cb0 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] de
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=182b9ee020e613fc4e4724e812271597
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5 b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5
index 4e95a5e95021..26e8dbf231b8 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] de
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb298731d70e2d9446f312b7b1d96bca
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-9999 b/metadata/md5-cache/dev-ros/hector_geotiff-9999
index 99395d8b2ea0..9330713977c8 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=182b9ee020e613fc4e4724e812271597
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.3 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.3
index 5345432c700d..cac19fe1616f 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fead46b755803e165c60bae34b45dc1d
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.4 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.4
index 20e0e4ea9c18..e77fea489c42 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fead46b755803e165c60bae34b45dc1d
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5
index cc4a6e855d80..aa53c425eb80 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49538e49eb09ed68b8827b86bf4c353a
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
index 5c4ee07a7aa6..b747648e1568 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_geotiff_plugins
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fead46b755803e165c60bae34b45dc1d
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.3 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.3
index 6545a7bfbccf..eed8c1d1a7ac 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_attitude_to_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-u
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9cbdbb455f451dd6e3124e9bf226d7e7
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.4 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.4
index 7e889190ba28..4623bffb9fed 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_attitude_to_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-u
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9cbdbb455f451dd6e3124e9bf226d7e7
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
index 2dc57e145fa4..cabfdf7d551a 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_attitude_to_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-u
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=083bedc578aba7190ad4e832db560eca
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 db06e90e6f2b..6981e39c4f3a 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_attitude_to_tf
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9cbdbb455f451dd6e3124e9bf226d7e7
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.3 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.3
index 1f2ce87fff6e..771281667b57 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tools for processing IMU messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93ada2377053ce0980579b045a61c510
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.4 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.4
index 7b7d15f6453e..5b809315c426 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tools for processing IMU messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93ada2377053ce0980579b045a61c510
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
index ffe98fcbbd0a..a326ee090cff 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tools for processing IMU messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b64c8ad26e25c5c8ef5f139b5bc8ec81
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-9999 b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
index 3fc19ae23db0..c3520e7f0d92 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tools for processing IMU messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_imu_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=93ada2377053ce0980579b045a61c510
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.3.3 b/metadata/md5-cache/dev-ros/hector_map_server-0.3.3
index 6895c52caff9..63151ec819ec 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing de
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aec7a4679f34948cd084140694791e69
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.3.4 b/metadata/md5-cache/dev-ros/hector_map_server-0.3.4
index 0dd32336b473..e3edd138c615 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing de
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aec7a4679f34948cd084140694791e69
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.3.5 b/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
index 2dc0e3362639..be5a7d6eee5d 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing de
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70d46fa2a79c9a9b19bf32c4082433da
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-9999 b/metadata/md5-cache/dev-ros/hector_map_server-9999
index b0838f34d634..34b90cfa16fe 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_server
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aec7a4679f34948cd084140694791e69
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3 b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3
index dd50914fdefe..825e9c0577a1 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8bbead6bf656431003b6f018e8f38093
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4 b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4
index de8293e10959..59e9c07d3431 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8bbead6bf656431003b6f018e8f38093
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5 b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5
index 39a9b979d8ed..e12356af82a3 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c59ab2b90715eaace02ebe3e159670c
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-9999 b/metadata/md5-cache/dev-ros/hector_map_tools-9999
index fb3ae65ce3cf..06f53ed847ff 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_map_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8bbead6bf656431003b6f018e8f38093
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.3.3 b/metadata/md5-cache/dev-ros/hector_mapping-0.3.3
index e23cb07a5d02..dacaaba7f843 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.3.3
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+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 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_mapping
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05adad9f66ed28414eef84e7c71b7749
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.3.4 b/metadata/md5-cache/dev-ros/hector_mapping-0.3.4
index 172125c7196e..b85b7b2c946a 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.3.4
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+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 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_mapping
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05adad9f66ed28414eef84e7c71b7749
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5 b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
index 886431a8ae4b..849961ad50c3 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+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 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_mapping
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e4a5adaf67324db3e09f6e6a57ffae80
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-9999 b/metadata/md5-cache/dev-ros/hector_mapping-9999
index 2873550143f1..60bf42f32a5f 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_mapping
@@ -8,5 +8,5 @@ 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] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05adad9f66ed28414eef84e7c71b7749
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
index 5c499cfc1f41..4edfa87f7428 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_marker_drawing
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eefb9992ba9e44eafc2aeeb0d6a5b55f
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
index 199fda9a5d13..d75f86d815cb 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_marker_drawing
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eefb9992ba9e44eafc2aeeb0d6a5b55f
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
index 4be7e8d81533..82d583231747 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_marker_drawing
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=679650e2b95c6e1855a1a4ee79b06e60
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999 b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
index 6f322022d8f1..ebd213690302 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_marker_drawing
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eefb9992ba9e44eafc2aeeb0d6a5b55f
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.3 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.3
index 5217a5aff512..9651f3286f26 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_nav_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=813f153f6a14a26fab4cb5c040d2aad0
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.4 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.4
index 1ef183281dc4..55ee41999c3c 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_nav_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=813f153f6a14a26fab4cb5c040d2aad0
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
index 9598fcd94936..06c002632dd3 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_nav_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=375b2d28a9ecd957e9676c5835fc1525
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index db297bbeb929..ad583e69ba8d 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and services used in the hector_slam stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_nav_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=813f153f6a14a26fab4cb5c040d2aad0
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.0 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.0
index d10bb13e2f95..242209165641 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.0
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_pose_estimation
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.2.0.tar.gz -> hector_localization-0.2.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a9c9be510bc8848cbdb7a08c594ced3
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.1 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.1
index dab17c46e136..aa1cb8864403 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_pose_estimation
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.2.1.tar.gz -> hector_localization-0.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a9c9be510bc8848cbdb7a08c594ced3
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0
index a6f0ea119971..6f1d5a84c439 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_pose_estimation
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[
 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
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b34286fec65bc9f9fadd1fe7e8779f87
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
index d01d6802e3e2..5eba31dd4cde 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_pose_estimation
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a9c9be510bc8848cbdb7a08c594ced3
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 83e560ad07a9..f200212fc261 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp 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-ros/tf dev-libs/boost:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp 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-ros/tf dev-libs/boost:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_pose_estimation_core
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ro
 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
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5f586dc37af581f54ecd17553b26f5de
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 5d2a3f66e4c9..256fb1d86e82 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp 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-ros/tf dev-libs/boost:= dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp 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-ros/tf dev-libs/boost:= dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_pose_estimation_core
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp 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-ros/tf dev-libs/boost:= dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=275067dd6facdc74895a3c0715f70f9c
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
index 4c3398d8d336..32bc818e41f7 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_slam_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c93688bba43d7cdfe89269afcc01e788
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
index 18ba47cae2ea..30fb110b5701 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_slam_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c93688bba43d7cdfe89269afcc01e788
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
index f9f34f356ed7..a23ad339cd36 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_slam_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=59ceed6655a35c2ccb559a87036c95cc
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-9999 b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
index d479436cc744..ae195869adbb 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_slam_launch
@@ -8,5 +8,5 @@ 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 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c93688bba43d7cdfe89269afcc01e788
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.3 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.3
index 9e8770ae49cc..6d0b27de309a 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.3
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_trajectory_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e69fb210086aa543d8c30c1a7b6fd4cb
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.4 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.4
index 0c8e6869919e..7589a4291c5b 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.4
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_trajectory_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e69fb210086aa543d8c30c1a7b6fd4cb
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
index 4d99ebcccdaf..e65b7e64e327 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_trajectory_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b26f097bb07c9c8d2b0a490bf0e09db
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999 b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
index 5e54bc68cdda..815d1a3c92f5 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/hector_trajectory_server
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e69fb210086aa543d8c30c1a7b6fd4cb
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 e0ea5d30a569..c6f440acb1ac 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_cb_detector
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8871f4909d28b3a7ca08a52881fcb36
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-9999 b/metadata/md5-cache/dev-ros/image_cb_detector-9999
index 84fe6f6b90b8..618516002953 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_cb_detector
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8871f4909d28b3a7ca08a52881fcb36
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.0-r1 b/metadata/md5-cache/dev-ros/image_geometry-1.12.0-r1
index 94bd34d6f84a..e974b975245e 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.0-r1
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_geometry
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.0.tar.gz -> vision_opencv-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a88c6761864304408abbe11171312d2
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.1 b/metadata/md5-cache/dev-ros/image_geometry-1.12.1
index ddd599cbb9e5..3e55c1ac7ec0 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.1
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_geometry
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.1.tar.gz -> vision_opencv-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2a88c6761864304408abbe11171312d2
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.2 b/metadata/md5-cache/dev-ros/image_geometry-1.12.2
index 8c0cc3ebcd55..c30217a880a0 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.2
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_geometry
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.2.tar.gz -> vision_opencv-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cacf82328ab7f64e89a27b302b267864
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.3 b/metadata/md5-cache/dev-ros/image_geometry-1.12.3
index 61a0dcbf469c..4057a5994caf 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.3
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_geometry
@@ -10,5 +10,5 @@ RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cacf82328ab7f64e89a27b302b267864
diff --git a/metadata/md5-cache/dev-ros/image_geometry-9999 b/metadata/md5-cache/dev-ros/image_geometry-9999
index b5175b0fb9e5..2feeb5982477 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_geometry
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a56b5bc7efe9a63a3c2567425864b21f
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.14 b/metadata/md5-cache/dev-ros/image_proc-1.12.14
index 53af7a9537b9..95e1f5fcaaba 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.14
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.14
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Single image rectification and color processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1bb31987365f6bb8ba868a15bb63006
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.15 b/metadata/md5-cache/dev-ros/image_proc-1.12.15
index b5a6a693fab9..917045351ed6 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.15
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.15
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Single image rectification and color processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1bb31987365f6bb8ba868a15bb63006
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.16 b/metadata/md5-cache/dev-ros/image_proc-1.12.16
index 6893a62a1806..ac36600c2183 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.16
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.16
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Single image rectification and color processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1bb31987365f6bb8ba868a15bb63006
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.18 b/metadata/md5-cache/dev-ros/image_proc-1.12.18
index ad8d933804d1..4844cc12fbda 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.18
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.18
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Single image rectification and color processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98fdeeb5ac8cfe6b18d50c8d71e78aaa
diff --git a/metadata/md5-cache/dev-ros/image_proc-1.12.19 b/metadata/md5-cache/dev-ros/image_proc-1.12.19
index a0fb28de9902..6f4046f593d9 100644
--- a/metadata/md5-cache/dev-ros/image_proc-1.12.19
+++ b/metadata/md5-cache/dev-ros/image_proc-1.12.19
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Single image rectification and color processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98fdeeb5ac8cfe6b18d50c8d71e78aaa
diff --git a/metadata/md5-cache/dev-ros/image_proc-9999 b/metadata/md5-cache/dev-ros/image_proc-9999
index 0736233e0680..abfa7b8a55ee 100644
--- a/metadata/md5-cache/dev-ros/image_proc-9999
+++ b/metadata/md5-cache/dev-ros/image_proc-9999
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Single image rectification and color processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_proc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1bb31987365f6bb8ba868a15bb63006
diff --git a/metadata/md5-cache/dev-ros/image_publisher-1.12.19 b/metadata/md5-cache/dev-ros/image_publisher-1.12.19
index 27561ba46c11..c80b392812f1 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.12.19
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.12.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/camera_info_manage
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9232b381cb3fff5eaa3a3e460356570d
diff --git a/metadata/md5-cache/dev-ros/image_publisher-9999 b/metadata/md5-cache/dev-ros/image_publisher-9999
index 7742b97d1751..e03518e3f5cc 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Publish an image stream from single image file or avi file.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_publisher
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9232b381cb3fff5eaa3a3e460356570d
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.14 b/metadata/md5-cache/dev-ros/image_rotate-1.12.14
index 76fcc8eca405..c9158bee59d1 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.14
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_rotate
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=003c3e08cce718eeefcc9df9510ca8ad
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.15 b/metadata/md5-cache/dev-ros/image_rotate-1.12.15
index aa8a7f72d1de..568006224a3a 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.15
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_rotate
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=003c3e08cce718eeefcc9df9510ca8ad
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.16 b/metadata/md5-cache/dev-ros/image_rotate-1.12.16
index 2f97bdf19a77..9ddcb9c2eb85 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.16
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_rotate
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=003c3e08cce718eeefcc9df9510ca8ad
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.18 b/metadata/md5-cache/dev-ros/image_rotate-1.12.18
index 4eba51bd56e6..68b667df999d 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.18
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_rotate
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c234c403d6135a6b9f75503ae7f59a3c
diff --git a/metadata/md5-cache/dev-ros/image_rotate-1.12.19 b/metadata/md5-cache/dev-ros/image_rotate-1.12.19
index 131dfe74f5dd..ff75345b9393 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-1.12.19
+++ b/metadata/md5-cache/dev-ros/image_rotate-1.12.19
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_rotate
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c234c403d6135a6b9f75503ae7f59a3c
diff --git a/metadata/md5-cache/dev-ros/image_rotate-9999 b/metadata/md5-cache/dev-ros/image_rotate-9999
index dd32e516a4aa..4512e55d879f 100644
--- a/metadata/md5-cache/dev-ros/image_rotate-9999
+++ b/metadata/md5-cache/dev-ros/image_rotate-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_rotate
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/eigen_conversions dev-ros/image_transport dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=003c3e08cce718eeefcc9df9510ca8ad
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.10 b/metadata/md5-cache/dev-ros/image_transport-1.11.10
index b1f78599b456..11f6008d47ef 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.10
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/ros
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.10.tar.gz -> image_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d866477d7d777b064ae31981ed50d9ab
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.11 b/metadata/md5-cache/dev-ros/image_transport-1.11.11
index 100e1ab10ea7..ebc0877c083a 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.11
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/ros
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.11.tar.gz -> image_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=de8b426a1bc801907fde2c83222e8712
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.7 b/metadata/md5-cache/dev-ros/image_transport-1.11.7
index 228203eaaaf1..92f6511e4179 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.7
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/ros
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.7.tar.gz -> image_common-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d866477d7d777b064ae31981ed50d9ab
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.8 b/metadata/md5-cache/dev-ros/image_transport-1.11.8
index 1ee1412dcc34..03629fa75821 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.8
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/ros
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.8.tar.gz -> image_common-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d866477d7d777b064ae31981ed50d9ab
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.9 b/metadata/md5-cache/dev-ros/image_transport-1.11.9
index 2567f2037c50..53e8c5f8ecbf 100644
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.9
+++ b/metadata/md5-cache/dev-ros/image_transport-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/ros
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.9.tar.gz -> image_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d866477d7d777b064ae31981ed50d9ab
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index 6cbd5085955c..764088bf83a5 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_transport
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d866477d7d777b064ae31981ed50d9ab
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.14-r1 b/metadata/md5-cache/dev-ros/image_view-1.12.14-r1
index 2521e4d86280..2410905284f7 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.14-r1
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.14-r1
@@ -1,5 +1,5 @@
 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 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/camera_calibration_parsers dev-ros/cv_bridge dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/came
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78b4fa7f1e938e908bc376522043be46
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.15 b/metadata/md5-cache/dev-ros/image_view-1.12.15
index 264c99d6848b..099c3f7e6468 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.15
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.15
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/came
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8eb6fbe8c02b8824421b433871eb9c75
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.16 b/metadata/md5-cache/dev-ros/image_view-1.12.16
index e79934e47943..5b6e0dcc27a8 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.16
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.16
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/came
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c9f4b6473b8da5c4c23578c416ccd1b
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.18 b/metadata/md5-cache/dev-ros/image_view-1.12.18
index d3ef44f07f0a..c83e06f564bc 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.18
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.18
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/came
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ed21ffa446c658c96eaa8a9faf47c15
diff --git a/metadata/md5-cache/dev-ros/image_view-1.12.19 b/metadata/md5-cache/dev-ros/image_view-1.12.19
index f986371e7f7d..49853b1d658b 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.19
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.19
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/came
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ed21ffa446c658c96eaa8a9faf47c15
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index ad5a2055145c..3a1f381cf322 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple viewer for ROS image topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_view
@@ -8,5 +8,5 @@ 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-ros/roscpp dev-ros/stereo_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8c9f4b6473b8da5c4c23578c416ccd1b
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.2.1 b/metadata/md5-cache/dev-ros/imu_processors-0.2.1
index 55ba294a2f2e..fca2f9986000 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-0.2.1
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.2.1
@@ -1,5 +1,5 @@
 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/imu_processors
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.1.tar.gz -> imu_pipeline-0.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=552634c9fb7aa98e83b435f99b67ee7d
diff --git a/metadata/md5-cache/dev-ros/imu_processors-9999 b/metadata/md5-cache/dev-ros/imu_processors-9999
index de72c02c735b..f6c848df5ac2 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -1,5 +1,5 @@
 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Processors for sensor_msgs::Imu data
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/imu_processors
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=552634c9fb7aa98e83b435f99b67ee7d
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.2.1 b/metadata/md5-cache/dev-ros/imu_transformer-0.2.1
index 7e73576a6fee..2116aa62378b 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.2.1
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/imu_transformer
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/roslaunch
 SLOT=0
 SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.1.tar.gz -> imu_pipeline-0.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd157b22a6c34c3cd0c35b33a925bcfd
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-9999 b/metadata/md5-cache/dev-ros/imu_transformer-9999
index 259c90f86da1..b3b2c64a5c53 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/imu_transformer
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=19b79d001168e602a2e2a37830e3cafd
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
index 2bb4d077ed6b..9ae733cbe5f7 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interactive marker tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interactive_marker_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ro
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a9f0e7c1524739964c8e5b5e6d16aaa
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.9.2 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.9.2
index 00cfc013d3ab..93a6758e4d47 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.9.2
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interactive marker tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interactive_marker_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ro
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a9f0e7c1524739964c8e5b5e6d16aaa
diff --git a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
index 4b5d252a84d8..67dbd4152b17 100644
--- a/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/interactive_marker_tutorials-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interactive marker tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interactive_marker_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/interactive_markers dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a9f0e7c1524739964c8e5b5e6d16aaa
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.11.1 b/metadata/md5-cache/dev-ros/interactive_markers-1.11.1
index 1fc9e4d2ee20..deac3d3b93ac 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.11.1
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interactive_markers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.11.1.tar.gz -> interactive_markers-1.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dca61203d1f9973fc303325e16748c9
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.11.3 b/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
index 251109b8177e..4f9c4d92d962 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interactive_markers
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.11.3.tar.gz -> interactive_markers-1.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f1b008ec5315e20eafd225466ffb7d59
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-9999 b/metadata/md5-cache/dev-ros/interactive_markers-9999
index 7d72d025f904..dfabb15fa1e0 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interactive_markers
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a3eb8a031094f19e0afc39f05a00b55
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 20d3a38ce3f6..9af1ba68a3d9 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
+++ b/metadata/md5-cache/dev-ros/interval_intersection-0.10.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for calculating the intersection of interval messages coming in on several topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interval_intersection
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68e14820d3ff1ee18b04c355bf55f732
diff --git a/metadata/md5-cache/dev-ros/interval_intersection-9999 b/metadata/md5-cache/dev-ros/interval_intersection-9999
index 990ac4406615..d27cac523ec6 100644
--- a/metadata/md5-cache/dev-ros/interval_intersection-9999
+++ b/metadata/md5-cache/dev-ros/interval_intersection-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for calculating the intersection of interval messages coming in on several topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/interval_intersection
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roscpp_serialization dev-ros/rostime dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba27ea235d7e9f7f9ca7f8401360704d
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.5 b/metadata/md5-cache/dev-ros/ivcon-0.1.5
index b14924dfe7f7..92f67aa49751 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.5
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Mesh Conversion Utility
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ivcon
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ivcon/archive/0.1.5.tar.gz -> ivcon-0.1.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3da94243f5c04780c795a0b8a0b083d
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.6 b/metadata/md5-cache/dev-ros/ivcon-0.1.6
index 17b60037956d..7ed0c9fc7a71 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.6
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Mesh Conversion Utility
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ivcon
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ivcon/archive/0.1.6.tar.gz -> ivcon-0.1.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3da94243f5c04780c795a0b8a0b083d
diff --git a/metadata/md5-cache/dev-ros/ivcon-9999 b/metadata/md5-cache/dev-ros/ivcon-9999
index be3796ce87ab..e410c02b6440 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Mesh Conversion Utility
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/ivcon
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b3da94243f5c04780c795a0b8a0b083d
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.0-r1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.0-r1
index bcd0f6bac3f6..f069018af79d 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.0-r1
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_limits_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 dev-util/
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2518de6723810c21358b3f360ff1425d
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1
index 042f40e40815..c8d7ea1f1639 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_limits_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 dev-util/
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2518de6723810c21358b3f360ff1425d
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.2 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.2
index 23b99d492026..a7604823d17e 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.2
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_limits_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-util/catk
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ac28402c66a1be279b80bd650a7912f2
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.3 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.3
index 4f5e4bdaac04..3eccad1cb2cd 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.3
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_limits_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a660b41d7745c1995684e3995ee9e8d5
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-9999 b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
index 4fad48365976..3346df63518f 100644
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-9999
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interface for enforcing joint limits
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_limits_interface
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-ros/urdf dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a660b41d7745c1995684e3995ee9e8d5
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.10 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.10
index fdd895a291bc..9d841f2682fc 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.10
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.11.10.tar.gz -> robot_model-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e125b8ef80ac5a168af2d17cdd8a6558
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.8 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.8
index b6978faf169d..e83c0cd57ecb 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.8
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.11.8.tar.gz -> robot_model-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e125b8ef80ac5a168af2d17cdd8a6558
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.9 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.9
index 680be866f19c..791468c2d8ba 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.9
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.11.9.tar.gz -> robot_model-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e125b8ef80ac5a168af2d17cdd8a6558
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.0 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.0
index 53958ede73b4..5cc8155ba691 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.0
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.0.tar.gz -> robot_model-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e125b8ef80ac5a168af2d17cdd8a6558
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.2 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.2
index d6518e038d18..49edf1f28eb1 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.2
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.2.tar.gz -> robot_model-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2601de1c5fa438a198c464c5d0757b7
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.3 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.3
index 81c216610d07..e9758b54f1ea 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.3
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6bf01faa75003c950056429b58f809dd
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.4 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.4
index 8a2ef1d05051..8eac1d69b341 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.4
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6bf01faa75003c950056429b58f809dd
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.5 b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.5
index 354ad81c1af0..36f10679b77d 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.5
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6bf01faa75003c950056429b58f809dd
diff --git a/metadata/md5-cache/dev-ros/joint_state_publisher-9999 b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
index aae6af37292c..8127ddb4843f 100644
--- a/metadata/md5-cache/dev-ros/joint_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/joint_state_publisher-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for setting and publishing joint state values for a given URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_state_publisher
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2601de1c5fa438a198c464c5d0757b7
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.13 b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.13
index da24925be094..4aba22e1bf1c 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-0.10.13
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-0.10.13
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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 ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_states_settler
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=981c1a9175aa46547218296824c99be4
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 cc86145c356e..ac31990170af 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,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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 ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_states_settler
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib dev-ros/rosconsole dev-ros/r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=981c1a9175aa46547218296824c99be4
diff --git a/metadata/md5-cache/dev-ros/joint_states_settler-9999 b/metadata/md5-cache/dev-ros/joint_states_settler-9999
index c841e1b7e40c..b182534baea8 100644
--- a/metadata/md5-cache/dev-ros/joint_states_settler-9999
+++ b/metadata/md5-cache/dev-ros/joint_states_settler-9999
@@ -1,5 +1,5 @@
 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 ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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 ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Reports how long a subset of joints has been settled
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/joint_states_settler
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=981c1a9175aa46547218296824c99be4
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-1.11.7 b/metadata/md5-cache/dev-ros/kdl_conversions-1.11.7
index 11087d44f22c..421927ad729e 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.11.7
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_conversions
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl dev-util/
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.7.tar.gz -> geometry-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=95814317d65834852c0ce6cd96633923
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-1.11.8 b/metadata/md5-cache/dev-ros/kdl_conversions-1.11.8
index cf0322720065..6cd6b2422628 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-1.11.8
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_conversions
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl dev-util/
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.8.tar.gz -> geometry-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=95814317d65834852c0ce6cd96633923
diff --git a/metadata/md5-cache/dev-ros/kdl_conversions-9999 b/metadata/md5-cache/dev-ros/kdl_conversions-9999
index a19da423972a..27055fc1dc33 100644
--- a/metadata/md5-cache/dev-ros/kdl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/kdl_conversions-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Conversion functions between KDL and geometry_msgs types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_conversions
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-libs/orocos_kdl dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=95814317d65834852c0ce6cd96633923
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.12.3-r1 b/metadata/md5-cache/dev-ros/kdl_parser-1.12.3-r1
index 15ef99e6d3fa..f45ea8af0fef 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.12.3-r1
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.12.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ebc0bd4ee99d2dcdbc73c26a9d6eead
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.12.4 b/metadata/md5-cache/dev-ros/kdl_parser-1.12.4
index dd1217e53dd5..80ec68d7f369 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.12.4
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ebc0bd4ee99d2dcdbc73c26a9d6eead
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.12.5 b/metadata/md5-cache/dev-ros/kdl_parser-1.12.5
index ea056227f5da..738d55229eeb 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.12.5
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3-r1 sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.12.3
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ebc0bd4ee99d2dcdbc73c26a9d6eead
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-9999 b/metadata/md5-cache/dev-ros/kdl_parser-9999
index ef01f444ae4a..775117224908 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ede9c584123a6f9680d1b86c3b16f31
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.10 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.10
index 92b30d8603b8..9c6b094c0e6a 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.10
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.11.10.tar.gz -> robot_model-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b77be9745745cd6282ee537e60511273
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.9 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.9
index 1f4838722dc3..ef3c4e86a04a 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.9
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.11.9.tar.gz -> robot_model-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b77be9745745cd6282ee537e60511273
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.0
index 558efefbbe30..4a87a8ba398b 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.0
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.0.tar.gz -> robot_model-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b77be9745745cd6282ee537e60511273
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.2 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.2
index ffe286c4dfa7..dbbae48cefee 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.2
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.2.tar.gz -> robot_model-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b77be9745745cd6282ee537e60511273
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.3 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.3
index 590a4b583b59..e71315991e27 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.3
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=257afbc2ad6edbd765e52ab9cf0b30a2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.4 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.4
index ba3d59322b86..2e07dbce5129 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.4
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=257afbc2ad6edbd765e52ab9cf0b30a2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.5 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.5
index 65728ce6e526..eae102028d1d 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.5
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=257afbc2ad6edbd765e52ab9cf0b30a2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index 698b8242b30e..ae9ea9ccb499 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/kdl_parser_py
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/urdf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b77be9745745cd6282ee537e60511273
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.3 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.3
index 2508f66c4b78..3fa0bfe0a489 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.3
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_assembler
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.3.tar.gz -> laser_assembler-1.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b808ba86ed5dc25a5686f6e438c6725
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.4 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.4
index 000a769b2585..8eece82dbd2c 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.4
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_assembler
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.4.tar.gz -> laser_assembler-1.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b808ba86ed5dc25a5686f6e438c6725
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-9999 b/metadata/md5-cache/dev-ros/laser_assembler-9999
index 2ac2ccfb7bd7..7cbb34d67d9f 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_assembler
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pluginlib dev-ros/message_filters[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/filters dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b808ba86ed5dc25a5686f6e438c6725
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.13 b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.13
index 12eba83f92f0..8f655fb49dad 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.13
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-0.10.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_cb_detector
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0448892955d75fbe9d2b1b658ebf58ff
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 8b98554cf11c..b991e2901b04 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_cb_detector
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0448892955d75fbe9d2b1b658ebf58ff
diff --git a/metadata/md5-cache/dev-ros/laser_cb_detector-9999 b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
index 58a5891242d7..10f5829cc11b 100644
--- a/metadata/md5-cache/dev-ros/laser_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/laser_cb_detector-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Extracts checkerboard corners from a dense laser snapshot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_cb_detector
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge dev-ros/image_cb_detector dev-ros/message_filters dev-ros/roscpp dev-ros/settlerlib dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0448892955d75fbe9d2b1b658ebf58ff
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.3 b/metadata/md5-cache/dev-ros/laser_filters-1.8.3
index 0b8e5de3b9ac..5dd24155fff2 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.3
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)]
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.3.tar.gz -> laser_filters-1.8.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=39250cf96d8f52fa86b859859318d379
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index ea3bfc7a76ee..1176d882a0c5 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_filters
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f5e2e01314cd5b549d6ec2a3c0685cbe
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.4 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
index 277651a84206..413d586622f5 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/cmake_modules test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/cmake_modules test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_geometry
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.4.tar.gz -> laser_geometry-1.6.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=461f0c61684657c117fe8fd0d654b334
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-9999 b/metadata/md5-cache/dev-ros/laser_geometry-9999
index 4049acc1fc42..fd35e001593c 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/cmake_modules test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/cmake_modules test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_geometry
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/eigen:3 dev-ros/angles dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=461f0c61684657c117fe8fd0d654b334
diff --git a/metadata/md5-cache/dev-ros/laser_proc-0.1.4 b/metadata/md5-cache/dev-ros/laser_proc-0.1.4
index 7c3586eb0131..9e41f820a46e 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.4
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-ros/sensor_msgs[ros_messages_cxx(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/laser_proc/archive/0.1.4.tar.gz -> laser_proc-0.1.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bc3a981ade8895bbc5e172fd1fc6e1f
diff --git a/metadata/md5-cache/dev-ros/laser_proc-9999 b/metadata/md5-cache/dev-ros/laser_proc-9999
index ff52fe786d4b..07527156a01d 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/laser_proc
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5bc3a981ade8895bbc5e172fd1fc6e1f
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.17.2 b/metadata/md5-cache/dev-ros/libmavconn-0.17.2
index 8664cbbb0c68..dfd3ef145eb9 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.17.2
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.17.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/conso
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.17.2.tar.gz -> mavros-0.17.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a93f42d7d303110603acbcc49e2366e0
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.17.3 b/metadata/md5-cache/dev-ros/libmavconn-0.17.3
index 3b09db601875..9793bb834150 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.17.3
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.17.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2015.12.12 dev-libs/boost:= dev-libs/conso
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.17.3.tar.gz -> mavros-0.17.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b4807c29cd204e607901f94a31159a28
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.18.1 b/metadata/md5-cache/dev-ros/libmavconn-0.18.1
index 93e3bf979404..39142d658921 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.18.1
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.18.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.6.24 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.6.24 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.6.24 dev-libs/boost:= dev-libs/consol
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.1.tar.gz -> mavros-0.18.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8bb953f1b7a7bbb828afc9d8533344f
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.18.2 b/metadata/md5-cache/dev-ros/libmavconn-0.18.2
index a590496b1340..495b8fe3e566 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.18.2
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.18.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.6.24 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.6.24 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.6.24 dev-libs/boost:= dev-libs/consol
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.2.tar.gz -> mavros-0.18.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8bb953f1b7a7bbb828afc9d8533344f
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.18.3 b/metadata/md5-cache/dev-ros/libmavconn-0.18.3
index 3ee231938f54..395c75f381fe 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.18.3
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.18.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.3.tar.gz -> mavros-0.18.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=999e4554fa1d8cee7fb4279371143e14
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.18.4 b/metadata/md5-cache/dev-ros/libmavconn-0.18.4
index 555dab7b22f0..14d58e7a2e20 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.18.4
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.18.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.4.tar.gz -> mavros-0.18.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=999e4554fa1d8cee7fb4279371143e14
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.18.5 b/metadata/md5-cache/dev-ros/libmavconn-0.18.5
index 050b9b60a186..8b8c20f49d42 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-0.18.5
+++ b/metadata/md5-cache/dev-ros/libmavconn-0.18.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.5.tar.gz -> mavros-0.18.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=999e4554fa1d8cee7fb4279371143e14
diff --git a/metadata/md5-cache/dev-ros/libmavconn-9999 b/metadata/md5-cache/dev-ros/libmavconn-9999
index 160f01ae76a6..fb188ab0b445 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=MAVLink communication library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/libmavconn
@@ -8,5 +8,5 @@ LICENSE=GPL-3 LGPL-3 BSD
 RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=999e4554fa1d8cee7fb4279371143e14
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1
index 2bef9867cc98..cf32ac73aab9 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tutorial showing how to compile your own C++ program with RViz displays and features
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/librviz_tutorial
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rviz dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=021fe3871d7837cf1cc69c1e57e85e53
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-0.9.2 b/metadata/md5-cache/dev-ros/librviz_tutorial-0.9.2
index 645d9cea8650..b4ff40e4c9b0 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-0.9.2
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tutorial showing how to compile your own C++ program with RViz displays and features
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/librviz_tutorial
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rviz dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=021fe3871d7837cf1cc69c1e57e85e53
diff --git a/metadata/md5-cache/dev-ros/librviz_tutorial-9999 b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
index eff46c5d32b5..0534e6fb9146 100644
--- a/metadata/md5-cache/dev-ros/librviz_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/librviz_tutorial-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rviz >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rviz >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tutorial showing how to compile your own C++ program with RViz displays and features
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/librviz_tutorial
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rviz dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=021fe3871d7837cf1cc69c1e57e85e53
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.13.0 b/metadata/md5-cache/dev-ros/map_msgs-1.13.0
index dd5fd7b31f59..f6321aaf5eec 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.13.0.tar.gz -> navigation_msgs-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20add6ad6f0c8bc25a71a3fad49a1ca5
diff --git a/metadata/md5-cache/dev-ros/map_msgs-9999 b/metadata/md5-cache/dev-ros/map_msgs-9999
index 5152b2aa2365..db635f25cf1e 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages commonly used in mapping packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=20add6ad6f0c8bc25a71a3fad49a1ca5
diff --git a/metadata/md5-cache/dev-ros/map_server-1.13.0 b/metadata/md5-cache/dev-ros/map_server-1.13.0
index 8e978e1cc0d5..d30029e45211 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.13.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Offers map data as a ROS service
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9354deb62330c1c4e8f11d46ec48eca2
diff --git a/metadata/md5-cache/dev-ros/map_server-1.13.1 b/metadata/md5-cache/dev-ros/map_server-1.13.1
index 56b6617bfbb5..a24ca445d8bd 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.13.1
+++ b/metadata/md5-cache/dev-ros/map_server-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Offers map data as a ROS service
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9354deb62330c1c4e8f11d46ec48eca2
diff --git a/metadata/md5-cache/dev-ros/map_server-1.14.0 b/metadata/md5-cache/dev-ros/map_server-1.14.0
index dd2d2289b9c7..18e0a659eb8c 100644
--- a/metadata/md5-cache/dev-ros/map_server-1.14.0
+++ b/metadata/md5-cache/dev-ros/map_server-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Offers map data as a ROS service
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1a4ffa491eac5ed1ac52435e0c041f10
diff --git a/metadata/md5-cache/dev-ros/map_server-9999 b/metadata/md5-cache/dev-ros/map_server-9999
index eb4184517649..51e35542b434 100644
--- a/metadata/md5-cache/dev-ros/map_server-9999
+++ b/metadata/md5-cache/dev-ros/map_server-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 test? ( dev-ros/rostest dev-cpp/gtest ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Offers map data as a ROS service
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/map_server
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= media-libs/sdl-image >=dev-cpp/yaml-cpp-0.5 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9354deb62330c1c4e8f11d46ec48eca2
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.11.11 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.11.11
index 7210de98934f..f29e58eb7843 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.11.11
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/future[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink message marshaling library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavlink-gbp-release
@@ -10,5 +10,5 @@ RDEPEND=dev-python/future[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/kinetic/mavlink/2016.11.11-2016.11.11.tar.gz -> mavlink-gbp-release-2016.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a17530dc043531282e3f6febbdfdf44c
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.7.7-r1 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.7.7-r1
index b00d85a3b925..74e4f9b4c776 100644
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.7.7-r1
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2016.7.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink message marshaling library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavlink-gbp-release
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/kinetic/mavlink/2016.7.7-2016.7.7.tar.gz -> mavlink-gbp-release-2016.7.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba129361b93cea0671121b1da43edc42
diff --git a/metadata/md5-cache/dev-ros/mavros-0.18.4 b/metadata/md5-cache/dev-ros/mavros-0.18.4
index 110abc7ffea6..05a149441c99 100644
--- a/metadata/md5-cache/dev-ros/mavros-0.18.4
+++ b/metadata/md5-cache/dev-ros/mavros-0.18.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf d
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.4.tar.gz -> mavros-0.18.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3448afcfcfe9e564cd6c458b9797aed
diff --git a/metadata/md5-cache/dev-ros/mavros-0.18.5 b/metadata/md5-cache/dev-ros/mavros-0.18.5
index b9698babfd3e..cd1c5be1e67b 100644
--- a/metadata/md5-cache/dev-ros/mavros-0.18.5
+++ b/metadata/md5-cache/dev-ros/mavros-0.18.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf d
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.5.tar.gz -> mavros-0.18.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3448afcfcfe9e564cd6c458b9797aed
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index 7e418a565502..06e042e4293f 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros
@@ -8,5 +8,5 @@ LICENSE=GPL-3 LGPL-3 BSD
 RDEPEND=dev-ros/diagnostic_updater dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/angles dev-ros/libmavconn dev-ros/rosconsole_bridge dev-libs/boost:= dev-ros/eigen_conversions dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.18.1[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(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3448afcfcfe9e564cd6c458b9797aed
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1 b/metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
index 28ad9d72767c..991d546008f8 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
+++ b/metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
@@ -1,5 +1,5 @@
 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_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_extras
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.3.tar.gz -> mavros-0.18.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=950487a5a73740784d509733f8069e9b
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.18.4 b/metadata/md5-cache/dev-ros/mavros_extras-0.18.4
index 01b514a6ff13..4f221cb2e3f2 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.18.4
+++ b/metadata/md5-cache/dev-ros/mavros_extras-0.18.4
@@ -1,5 +1,5 @@
 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_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_extras
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.4.tar.gz -> mavros-0.18.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=950487a5a73740784d509733f8069e9b
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.18.5 b/metadata/md5-cache/dev-ros/mavros_extras-0.18.5
index 2b471e55fd0d..a574c4bf0e3c 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.18.5
+++ b/metadata/md5-cache/dev-ros/mavros_extras-0.18.5
@@ -1,5 +1,5 @@
 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_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_extras
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.5.tar.gz -> mavros-0.18.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=950487a5a73740784d509733f8069e9b
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index 4e8e031e46f0..21a3c3780ab0 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -1,5 +1,5 @@
 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_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_extras
@@ -8,5 +8,5 @@ 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_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=950487a5a73740784d509733f8069e9b
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.17.2 b/metadata/md5-cache/dev-ros/mavros_msgs-0.17.2
index 26196df1197e..5e02afe462dd 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.17.2
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.17.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.17.2.tar.gz -> mavros-0.17.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8836a4f797bfbb72ede223888177a113
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.17.3 b/metadata/md5-cache/dev-ros/mavros_msgs-0.17.3
index 630cadb7a44e..d4189d9015c3 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.17.3
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.17.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.17.3.tar.gz -> mavros-0.17.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3274eed5139ee0dc65fa9c7b2c8ff3dd
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.1 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.1
index 1e0a3640bdbc..2a0d26dde73e 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.1
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.1.tar.gz -> mavros-0.18.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3274eed5139ee0dc65fa9c7b2c8ff3dd
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.2 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.2
index ea79cd31028a..667aadcdd029 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.2
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.2.tar.gz -> mavros-0.18.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3274eed5139ee0dc65fa9c7b2c8ff3dd
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.3 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.3
index b1cf4cdcedc5..39464ca2f382 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.3
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.3.tar.gz -> mavros-0.18.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3274eed5139ee0dc65fa9c7b2c8ff3dd
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.4 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.4
index 3e5158786f36..9d4b810116d0 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.4
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.4.tar.gz -> mavros-0.18.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3274eed5139ee0dc65fa9c7b2c8ff3dd
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.5 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.5
index 77421a187af3..63f102be5b93 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.5
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.5.tar.gz -> mavros-0.18.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3274eed5139ee0dc65fa9c7b2c8ff3dd
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index 790ab880dc2a..73566685120e 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for MAVROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8836a4f797bfbb72ede223888177a113
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.11.14 b/metadata/md5-cache/dev-ros/message_filters-1.11.14
index 8ee2d61ece64..e5c32c7f0c9f 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.11.14
+++ b/metadata/md5-cache/dev-ros/message_filters-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.11.15 b/metadata/md5-cache/dev-ros/message_filters-1.11.15
index dce9e6794ada..8f97137f6a0b 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.11.15
+++ b/metadata/md5-cache/dev-ros/message_filters-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.11.16 b/metadata/md5-cache/dev-ros/message_filters-1.11.16
index ae4b0c01b9f3..760350f8c88d 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.11.16
+++ b/metadata/md5-cache/dev-ros/message_filters-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.11.17 b/metadata/md5-cache/dev-ros/message_filters-1.11.17
index b775c23e798b..036813623793 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.11.17
+++ b/metadata/md5-cache/dev-ros/message_filters-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.12.0 b/metadata/md5-cache/dev-ros/message_filters-1.12.0
index 74f441f55ae0..54f433b79ccd 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.12.0
+++ b/metadata/md5-cache/dev-ros/message_filters-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.12.1 b/metadata/md5-cache/dev-ros/message_filters-1.12.1
index 8207668b08bd..2c74e14f688f 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.12.1
+++ b/metadata/md5-cache/dev-ros/message_filters-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.12.2 b/metadata/md5-cache/dev-ros/message_filters-1.12.2
index 52cb7f6cafc6..b0f2e15a1e01 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.12.2
+++ b/metadata/md5-cache/dev-ros/message_filters-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06d6c9f027092b91dbe77cdc88eab0b5
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.12.4 b/metadata/md5-cache/dev-ros/message_filters-1.12.4
index 4885f87d0085..e054cde3c340 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.12.4
+++ b/metadata/md5-cache/dev-ros/message_filters-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06d6c9f027092b91dbe77cdc88eab0b5
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.12.5 b/metadata/md5-cache/dev-ros/message_filters-1.12.5
index 513c937ed0ea..0cb70e57fb44 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.12.5
+++ b/metadata/md5-cache/dev-ros/message_filters-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06d6c9f027092b91dbe77cdc88eab0b5
diff --git a/metadata/md5-cache/dev-ros/message_filters-1.12.6 b/metadata/md5-cache/dev-ros/message_filters-1.12.6
index 46622c5a2bf5..8eead0a15bf5 100644
--- a/metadata/md5-cache/dev-ros/message_filters-1.12.6
+++ b/metadata/md5-cache/dev-ros/message_filters-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06d6c9f027092b91dbe77cdc88eab0b5
diff --git a/metadata/md5-cache/dev-ros/message_filters-9999 b/metadata/md5-cache/dev-ros/message_filters-9999
index cdd206c49acb..01b603572a63 100644
--- a/metadata/md5-cache/dev-ros/message_filters-9999
+++ b/metadata/md5-cache/dev-ros/message_filters-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of message filters which take in messages and may output those messages at a later time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_filters
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/xmlrpcpp dev-libs/boost:=[threads] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee1fce001f03a16dbcf3bd21d506341
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.3.0 b/metadata/md5-cache/dev-ros/message_generation-0.3.0
index 15142056ee53..08554b931ac9 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.3.0
+++ b/metadata/md5-cache/dev-ros/message_generation-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_generation
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/gene
 SLOT=0
 SRC_URI=https://github.com/ros/message_generation/archive/0.3.0.tar.gz -> message_generation-0.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b1224be99352b2504c7a61fe05ac936
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.4.0 b/metadata/md5-cache/dev-ros/message_generation-0.4.0
index e2dd5f60e071..10ec64ce8b9b 100644
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.0
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.0
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_generation
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/gene
 SLOT=0
 SRC_URI=https://github.com/ros/message_generation/archive/0.4.0.tar.gz -> message_generation-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3096fd28743afb2531f94607498f69c5
diff --git a/metadata/md5-cache/dev-ros/message_generation-9999 b/metadata/md5-cache/dev-ros/message_generation-9999
index e6453fbd6300..944b285253d4 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_generation
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3096fd28743afb2531f94607498f69c5
diff --git a/metadata/md5-cache/dev-ros/message_runtime-0.4.12 b/metadata/md5-cache/dev-ros/message_runtime-0.4.12
index 0df8685ffd7c..f10a8d68fcca 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.12
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_runtime
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 SLOT=0
 SRC_URI=https://github.com/ros/message_runtime/archive/0.4.12.tar.gz -> message_runtime-0.4.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ec9eee36e8ffa57ca4bb57a16096c8d
diff --git a/metadata/md5-cache/dev-ros/message_runtime-9999 b/metadata/md5-cache/dev-ros/message_runtime-9999
index e2520a28d8b5..d67676960244 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_runtime
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ec9eee36e8ffa57ca4bb57a16096c8d
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.2.0 b/metadata/md5-cache/dev-ros/message_to_tf-0.2.0
index ed76d6520de3..36fd3b7128c9 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.2.0
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Translates pose information from different kind of common_msgs message types to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_to_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[r
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.2.0.tar.gz -> hector_localization-0.2.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52c3dae2ae21fc7cc0f696008cbe8814
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.2.1 b/metadata/md5-cache/dev-ros/message_to_tf-0.2.1
index 0fc346196725..fb112fa7dec6 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.2.1
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Translates pose information from different kind of common_msgs message types to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_to_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[r
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.2.1.tar.gz -> hector_localization-0.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52c3dae2ae21fc7cc0f696008cbe8814
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 cddbac9a6498..9a167c6153da 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Translates pose information from different kind of common_msgs message types to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_to_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[r
 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
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=61b8482398f9c6ad4a1105f6a2cea09d
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-9999 b/metadata/md5-cache/dev-ros/message_to_tf-9999
index 8f63756e11a9..c00e6e4f6bd3 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Translates pose information from different kind of common_msgs message types to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/message_to_tf
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52c3dae2ae21fc7cc0f696008cbe8814
diff --git a/metadata/md5-cache/dev-ros/mk-1.12.3 b/metadata/md5-cache/dev-ros/mk-1.12.3
index 556dbb984e08..ecb00363de52 100644
--- a/metadata/md5-cache/dev-ros/mk-1.12.3
+++ b/metadata/md5-cache/dev-ros/mk-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b3e4a76678aa47c6519e2ba6523f701
diff --git a/metadata/md5-cache/dev-ros/mk-1.12.5 b/metadata/md5-cache/dev-ros/mk-1.12.5
index 5b0c7266a000..23c3744a0bb6 100644
--- a/metadata/md5-cache/dev-ros/mk-1.12.5
+++ b/metadata/md5-cache/dev-ros/mk-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b3e4a76678aa47c6519e2ba6523f701
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.1 b/metadata/md5-cache/dev-ros/mk-1.13.1
index 55c131a9c910..18b0d378ab14 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.1
+++ b/metadata/md5-cache/dev-ros/mk-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b3e4a76678aa47c6519e2ba6523f701
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.2 b/metadata/md5-cache/dev-ros/mk-1.13.2
index 80e65f80cef2..94d2da703979 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.2
+++ b/metadata/md5-cache/dev-ros/mk-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04ac7b0b6f24aaae8358c37701d1a824
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.3 b/metadata/md5-cache/dev-ros/mk-1.13.3
index fbc524129f27..5bc691dbd019 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.3
+++ b/metadata/md5-cache/dev-ros/mk-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04ac7b0b6f24aaae8358c37701d1a824
diff --git a/metadata/md5-cache/dev-ros/mk-1.13.4 b/metadata/md5-cache/dev-ros/mk-1.13.4
index bb9fee837694..9daf5133c023 100644
--- a/metadata/md5-cache/dev-ros/mk-1.13.4
+++ b/metadata/md5-cache/dev-ros/mk-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04ac7b0b6f24aaae8358c37701d1a824
diff --git a/metadata/md5-cache/dev-ros/mk-9999 b/metadata/md5-cache/dev-ros/mk-9999
index 77ef0df6ab27..53aa80134064 100644
--- a/metadata/md5-cache/dev-ros/mk-9999
+++ b/metadata/md5-cache/dev-ros/mk-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A collection of .mk include files for building ROS architectural elements
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mk
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b3e4a76678aa47c6519e2ba6523f701
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-0.10.13 b/metadata/md5-cache/dev-ros/monocam_settler-0.10.13
index e79a4e823b80..993db2f72994 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.13
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/monocam_settler
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ba2f64d0db40d91bbcf8a29d6a24157
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 d4d38118fb2a..ef9ebf238607 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
+++ b/metadata/md5-cache/dev-ros/monocam_settler-0.10.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/monocam_settler
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ba2f64d0db40d91bbcf8a29d6a24157
diff --git a/metadata/md5-cache/dev-ros/monocam_settler-9999 b/metadata/md5-cache/dev-ros/monocam_settler-9999
index 331c3fcf6a98..bde6819cc739 100644
--- a/metadata/md5-cache/dev-ros/monocam_settler-9999
+++ b/metadata/md5-cache/dev-ros/monocam_settler-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Listens on a ImageFeatures topic, and waits for the data to settle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/monocam_settler
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/settlerlib dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ba2f64d0db40d91bbcf8a29d6a24157
diff --git a/metadata/md5-cache/dev-ros/move_base-1.14.0 b/metadata/md5-cache/dev-ros/move_base-1.14.0
index 705c09caf9ea..a638acb77a7a 100644
--- a/metadata/md5-cache/dev-ros/move_base-1.14.0
+++ b/metadata/md5-cache/dev-ros/move_base-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_base
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/act
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0f00e22bf83674b94ded3e6f6f94e041
diff --git a/metadata/md5-cache/dev-ros/move_base-9999 b/metadata/md5-cache/dev-ros/move_base-9999
index 5f3a5d14b10b..1fb4e4681ece 100644
--- a/metadata/md5-cache/dev-ros/move_base-9999
+++ b/metadata/md5-cache/dev-ros/move_base-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_base
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97d9ba6231b96fa437b3740123d1b60d
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0 b/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
index 9d27ce4c28ec..845c2dd6aa0e 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_base_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.13.0.tar.gz -> navigation_msgs-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c00eb5f5ae98b9330c46401f4b1851d0
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-9999 b/metadata/md5-cache/dev-ros/move_base_msgs-9999
index a4471d543fdc..9e6a0afe8b16 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_base_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c00eb5f5ae98b9330c46401f4b1851d0
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.0 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.0
index 7ab894d2a459..abbb08f9ca6d 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.0
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Move slow and clear
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_slow_and_clear
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msg
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10ff025e66179af9a9c2d030f85bb4f3
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.1 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.1
index 16b2711ca31a..ae4ab42ab377 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.1
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Move slow and clear
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_slow_and_clear
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msg
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10ff025e66179af9a9c2d030f85bb4f3
diff --git a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.14.0 b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.14.0
index a8700991baf2..6af88d0b2e14 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-1.14.0
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Move slow and clear
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_slow_and_clear
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msg
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=80bb31a6db0860333ed03c6e3637c215
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 ceaf03207c4c..0bdafd18a57c 100644
--- a/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
+++ b/metadata/md5-cache/dev-ros/move_slow_and_clear-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Move slow and clear
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/move_slow_and_clear
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/nav_core dev-ros/costmap_2d dev-ros/actionlib_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/boost:=[threads] dev-cpp/eigen:3 sci-libs/pcl dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=10ff025e66179af9a9c2d030f85bb4f3
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.8.0 b/metadata/md5-cache/dev-ros/moveit_msgs-0.8.0
index 18cdb25ddc74..1e70a72ec54d 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.8.0
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/moveit_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.8.0.tar.gz -> moveit_msgs-0.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b459c1f6d161b6110f35e7ad34eb6eb
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.8.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.8.1
index ad1e2a1bbeab..2ea42381fde2 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.8.1
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.8.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/moveit_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.8.1.tar.gz -> moveit_msgs-0.8.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918bcbd0e4e8e64af922f303d1a050a2
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.8.3 b/metadata/md5-cache/dev-ros/moveit_msgs-0.8.3
index 9b341bea02eb..8d96a9db0833 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.8.3
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.8.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/moveit_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.8.3.tar.gz -> moveit_msgs-0.8.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918bcbd0e4e8e64af922f303d1a050a2
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.9.0 b/metadata/md5-cache/dev-ros/moveit_msgs-0.9.0
index 46a4f6bc2480..4a198969dfd8 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.9.0
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.9.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/moveit_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.9.0.tar.gz -> moveit_msgs-0.9.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=918bcbd0e4e8e64af922f303d1a050a2
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-9999 b/metadata/md5-cache/dev-ros/moveit_msgs-9999
index b4c4a4c31c01..222cdd59247f 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages, services and actions used by MoveIt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/moveit_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b459c1f6d161b6110f35e7ad34eb6eb
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.13.0 b/metadata/md5-cache/dev-ros/nav_core-1.13.0
index 077eb4b54a19..4b6334459a44 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.13.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_core
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4d76b83d8f34c2c2cce5dc033f9d140
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.13.1 b/metadata/md5-cache/dev-ros/nav_core-1.13.1
index cf55fb2b8829..e5f9028730a9 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.13.1
+++ b/metadata/md5-cache/dev-ros/nav_core-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_core
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4d76b83d8f34c2c2cce5dc033f9d140
diff --git a/metadata/md5-cache/dev-ros/nav_core-1.14.0 b/metadata/md5-cache/dev-ros/nav_core-1.14.0
index 66b9dced382b..841f2bbbea50 100644
--- a/metadata/md5-cache/dev-ros/nav_core-1.14.0
+++ b/metadata/md5-cache/dev-ros/nav_core-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_core
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c635d382e33889dacc4026eb424c1d2b
diff --git a/metadata/md5-cache/dev-ros/nav_core-9999 b/metadata/md5-cache/dev-ros/nav_core-9999
index 340b8b1a0704..262b8cb9f7f9 100644
--- a/metadata/md5-cache/dev-ros/nav_core-9999
+++ b/metadata/md5-cache/dev-ros/nav_core-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common interfaces for navigation specific robot actions
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_core
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/costmap_2d dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f4d76b83d8f34c2c2cce5dc033f9d140
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.3 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.3
index 546549a829ba..630a48218c52 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8ec8683f60327d114a384eded29235a
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.4 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.4
index 6d9c0425b529..5b4957a84554 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8ec8683f60327d114a384eded29235a
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-1.12.5 b/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
index bfba6a03b74c..300a798e2414 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/nav_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70534390b249b49a5a28df0606c080f6
diff --git a/metadata/md5-cache/dev-ros/nav_msgs-9999 b/metadata/md5-cache/dev-ros/nav_msgs-9999
index 5798663e570b..fbf30ee87c79 100644
--- a/metadata/md5-cache/dev-ros/nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nav_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Common messages used to interact with the navigation stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nav_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8ec8683f60327d114a384eded29235a
diff --git a/metadata/md5-cache/dev-ros/navfn-1.14.0-r1 b/metadata/md5-cache/dev-ros/navfn-1.14.0-r1
index 6be2088345c0..71bbf7f4a67e 100644
--- a/metadata/md5-cache/dev-ros/navfn-1.14.0-r1
+++ b/metadata/md5-cache/dev-ros/navfn-1.14.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/navfn
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09911cc227cbdd89fbae37d06fa45b10
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index 6851f5c91036..07d9930392b2 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/navfn
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=09911cc227cbdd89fbae37d06fa45b10
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.3 b/metadata/md5-cache/dev-ros/nodelet-1.9.3
index f02d4ad97c59..3dca7f4d75a4 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.3
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.3.tar.gz -> nodelet_core-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7910c9a65f00bf8d448330979ce4424c
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.4 b/metadata/md5-cache/dev-ros/nodelet-1.9.4
index 03e418e2089c..efe3489e56a2 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.4
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.4.tar.gz -> nodelet_core-1.9.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7910c9a65f00bf8d448330979ce4424c
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.5 b/metadata/md5-cache/dev-ros/nodelet-1.9.5
index f2e02b3c50c0..c0d054c4f955 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.5
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.5.tar.gz -> nodelet_core-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64413512043e09a357c5d2bd09ce0b31
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.6 b/metadata/md5-cache/dev-ros/nodelet-1.9.6
index 8b3eb0a87853..04d63dbbf61a 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.6
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.6.tar.gz -> nodelet_core-1.9.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64413512043e09a357c5d2bd09ce0b31
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.7 b/metadata/md5-cache/dev-ros/nodelet-1.9.7
index 1833ec38d937..8806dead619b 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.7
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.7.tar.gz -> nodelet_core-1.9.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64413512043e09a357c5d2bd09ce0b31
diff --git a/metadata/md5-cache/dev-ros/nodelet-1.9.8 b/metadata/md5-cache/dev-ros/nodelet-1.9.8
index 6daaa7cd7cb4..6ff4160b0db2 100644
--- a/metadata/md5-cache/dev-ros/nodelet-1.9.8
+++ b/metadata/md5-cache/dev-ros/nodelet-1.9.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.8.tar.gz -> nodelet_core-1.9.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=64413512043e09a357c5d2bd09ce0b31
diff --git a/metadata/md5-cache/dev-ros/nodelet-9999 b/metadata/md5-cache/dev-ros/nodelet-9999
index 5ac46c1a9347..3fe5c75beaaa 100644
--- a/metadata/md5-cache/dev-ros/nodelet-9999
+++ b/metadata/md5-cache/dev-ros/nodelet-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Provides a way to run multiple algorithms in the same process with zero copy transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bondcpp dev-ros/cmake_modules dev-ros/pluginlib dev-ros/rosconsole dev-ros/roscpp dev-libs/boost:= sys-apps/util-linux dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7910c9a65f00bf8d448330979ce4424c
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3
index d8a8c5b25099..2f3cb1184d05 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/message_fi
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.3.tar.gz -> nodelet_core-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4f44a6aa7466668b1707c11a860fd9fe
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3-r1 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3-r1
index 5634d91b2a98..f07869f0cd5f 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3-r1
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.3.tar.gz -> nodelet_core-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5b4d076ce619aa59ef5600847479ebe
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.4 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.4
index dbfc3fedaf50..1b5b33423617 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.4
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.4.tar.gz -> nodelet_core-1.9.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5b4d076ce619aa59ef5600847479ebe
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.5 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.5
index a8c71d872c96..e2d8405b47e2 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.5
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.5.tar.gz -> nodelet_core-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d716a2a5f5aaefdb597fcc7600539e68
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.6 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.6
index 7c3a857462fd..1e367d595054 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.6
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.6.tar.gz -> nodelet_core-1.9.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d716a2a5f5aaefdb597fcc7600539e68
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.7 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.7
index 780a5b3180db..e9e2f5f83013 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.7
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.7.tar.gz -> nodelet_core-1.9.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d716a2a5f5aaefdb597fcc7600539e68
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.8 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.8
index 06d485d43b87..affbd6f1c4b1 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.8
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.8.tar.gz -> nodelet_core-1.9.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d716a2a5f5aaefdb597fcc7600539e68
diff --git a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999 b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
index c727f106018d..71b959de6920 100644
--- a/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_topic_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common nodelet tools such as a mux, demux and throttle
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_topic_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/nodelet dev-ros/pluginlib dev-ros/roscpp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a5b4d076ce619aa59ef5600847479ebe
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10
index 0e3eb2143070..2e2c58f75729 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelet tutorial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_tutorial_math
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=16539871fcfff568dbf088f1edc93a7c
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.8 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.8
index 157565dfcb8d..b1c9e32914e2 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.8
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelet tutorial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_tutorial_math
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddc13479d8242d0b549efb72d41be799
diff --git a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999 b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
index 88f37673aca3..71d2cd307c09 100644
--- a/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
+++ b/metadata/md5-cache/dev-ros/nodelet_tutorial_math-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Nodelet tutorial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/nodelet_tutorial_math
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/nodelet dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ddc13479d8242d0b549efb72d41be799
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 a27e9b00e6f1..94fe23202663 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/object_recognition_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 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
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ed4055a2376609a2323b5e7a579683a
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999 b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
index 7755ca55bfe0..aa8c2dcf7326 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/object_recognition_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ed4055a2376609a2323b5e7a579683a
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.2 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.2
index 57486e2cd333..dbbe2a4667ef 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.2
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/octomap_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.2.tar.gz -> octomap_msgs-0.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b674c9b381379c3102a6e001d233c2
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
index 00adb1cc35ac..710306a8e506 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/octomap_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.3.tar.gz -> octomap_msgs-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a779d2db5d4e33f6a566346bb5af5776
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-9999 b/metadata/md5-cache/dev-ros/octomap_msgs-9999
index 9e82b27a7a06..294aea343b64 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/octomap_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b674c9b381379c3102a6e001d233c2
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1 b/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
index 25acc52448d4..6fadee2174fc 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
@@ -1,5 +1,5 @@
 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/octomap_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_mes
 SLOT=0
 SRC_URI=https://github.com/OctoMap/octomap_ros/archive/0.4.0.tar.gz -> octomap_ros-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e7cd1d411d4d2bb1de2a3fb344724e5
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-9999 b/metadata/md5-cache/dev-ros/octomap_ros-9999
index f2ce36c3291f..5db1da17768f 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -1,5 +1,5 @@
 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/octomap_ros
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5e7cd1d411d4d2bb1de2a3fb344724e5
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-1.11.14 b/metadata/md5-cache/dev-ros/opencv_apps-1.11.14
index 3cc56ce8549c..89e1e4f5409f 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-1.11.14
+++ b/metadata/md5-cache/dev-ros/opencv_apps-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp >=media-libs/opencv-3:0=[contrib] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp >=media-libs/opencv-3:0=[contrib] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/opencv_apps
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/1.11.14.tar.gz -> opencv_apps-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45e5b645f5f2c2a838b148178b22c392
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index b5685ab23b7f..08c3c2d8cdbb 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp >=media-libs/opencv-3:0=[contrib] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp >=media-libs/opencv-3:0=[contrib] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=OpenCV applications for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/opencv_apps
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-ros/roscpp >=media-libs/opencv-3:0=[contrib] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=45e5b645f5f2c2a838b148178b22c392
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
index 8039db818426..e3b1d969fdc9 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/opencv_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.1.tar.gz -> vision_opencv-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9df5f345e8a9d9ccef9b9bf4ec67a2a7
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.2 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
index 8722704fd752..3ee3e9cbb592 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/opencv_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.2.tar.gz -> vision_opencv-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9df5f345e8a9d9ccef9b9bf4ec67a2a7
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.3 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
index 81983c1cc29d..5d7ec9d342ba 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/opencv_tests
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9df5f345e8a9d9ccef9b9bf4ec67a2a7
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-9999 b/metadata/md5-cache/dev-ros/opencv_tests-9999
index de5d5d375da2..19354680ca72 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for ROS OpenCV integration
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/opencv_tests
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9df5f345e8a9d9ccef9b9bf4ec67a2a7
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.2.7-r1 b/metadata/md5-cache/dev-ros/openni2_camera-0.2.7-r1
index c50b08350c9b..7aa145313fe5 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.2.7-r1
+++ b/metadata/md5-cache/dev-ros/openni2_camera-0.2.7-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openni2_camera
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reco
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.2.7.tar.gz -> openni2_camera-0.2.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5781216a81eafa4f58be80376e9072ba
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-9999 b/metadata/md5-cache/dev-ros/openni2_camera-9999
index ab9e307809dc..07fb1c973581 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openni2_camera
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5781216a81eafa4f58be80376e9072ba
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-0.2.2 b/metadata/md5-cache/dev-ros/openni2_launch-0.2.2
index 56033b3e3fc3..2a39d4b4d897 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-0.2.2
+++ b/metadata/md5-cache/dev-ros/openni2_launch-0.2.2
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openni2_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/openni2_launch/archive/0.2.2.tar.gz -> openni2_launch-0.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65a65e1d2b21186b991dad1878a1b305
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index 76c5d7f76330..adaa273186c3 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -1,5 +1,5 @@
 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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openni2_launch
@@ -8,5 +8,5 @@ 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-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=65a65e1d2b21186b991dad1878a1b305
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
index 8d3526f545d0..30ac6977a31c 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openslam_gmapping
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.1.1.tar.gz -> openslam_gmapping-0.1.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70fbacee07e2a749247ae74037e5a1f7
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
index ef1b18a762a4..5e2c26169027 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openslam_gmapping
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.1.2.tar.gz -> openslam_gmapping-0.1.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d50641787efdc9c099a8fcb2a3519bf0
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-9999 b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
index 173e0ea14497..bd119fa751fe 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS-ified version of gmapping SLAM
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/openslam_gmapping
@@ -8,5 +8,5 @@ LICENSE=CC-BY-NC-SA-2.5
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=70fbacee07e2a749247ae74037e5a1f7
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1 b/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1
index ca6fba49dd2d..0c41db3dfbc2 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-0.2.1-r1
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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 ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_conversions
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pcl_conversions/archive/0.2.1.tar.gz -> pcl_conversions-0.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a2da569aded9859f3b4231aa3e6c03f
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index 25f1f5aad69d..7415e9d4eb74 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -1,5 +1,5 @@
 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 ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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 ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_conversions
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=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 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6a2da569aded9859f3b4231aa3e6c03f
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0 b/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
index b6d0bdfef978..cbf84050c9c4 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pcl_msgs/archive/0.2.0.tar.gz -> pcl_msgs-0.2.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f6f4ab2415c5e64736bca1fbcbedb89
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-9999 b/metadata/md5-cache/dev-ros/pcl_msgs-9999
index 27169f59723c..72f4b8add321 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2f6f4ab2415c5e64736bca1fbcbedb89
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2 b/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
index eb1d08016ef1..b3202f492797 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib 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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.4.1.tar.gz -> perception_pcl-1.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ef060c99575f29020f98aa44c69c9c5
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index d3a83ad72801..199203851cb3 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_ros
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib 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(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ef060c99575f29020f98aa44c69c9c5
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1 b/metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1
index cfcba9f7efe7..5a395ebba048 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.10.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pluginlib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_ta
 SLOT=0
 SRC_URI=https://github.com/ros/pluginlib/archive/1.10.4.tar.gz -> pluginlib-1.10.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06253a270f216d1404036c685e6f1497
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index e81e84387c85..9c7f719eb18e 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pluginlib
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/class_loader-0.3.5 dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06253a270f216d1404036c685e6f1497
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10
index c0089399f75e..f392d988bba6 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Pluginlib tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pluginlib_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-util/catkin dev-py
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=22ab7294e0b2a4767e95de37da7f54cf
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.8 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.8
index 7315a71f2bf3..3a654f406ce3 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.8
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Pluginlib tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pluginlib_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-util/catkin dev-py
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6510a1c1ffedab2ca9df583481778f7c
diff --git a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999 b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
index 31fce2ffbb2c..ae030ffd256f 100644
--- a/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib_tutorials-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Pluginlib tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pluginlib_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/pluginlib dev-ros/roscpp dev-libs/boost:= dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6510a1c1ffedab2ca9df583481778f7c
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.3.0 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.3.0
index bc15c47c5f1a..1fc483aaf93f 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.3.0
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pointcloud_to_laserscan
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_ms
 SLOT=0
 SRC_URI=https://github.com/ros-perception/pointcloud_to_laserscan/archive/1.3.0.tar.gz -> pointcloud_to_laserscan-1.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2edf5f92a3129e617f12e820dd0ba09e
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
index 827092c88331..7910091a6d46 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pointcloud_to_laserscan
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2edf5f92a3129e617f12e820dd0ba09e
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.10 b/metadata/md5-cache/dev-ros/polled_camera-1.11.10
index a23562090125..4e06076e3ff5 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.10
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/polled_camera
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.10.tar.gz -> image_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd79875c1099151568898b58fb3173fd
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.11 b/metadata/md5-cache/dev-ros/polled_camera-1.11.11
index 68fd958afc6b..037332f173ca 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.11
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/polled_camera
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.11.tar.gz -> image_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=688e72f6f01d8980f16ed09db1ce492d
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.7 b/metadata/md5-cache/dev-ros/polled_camera-1.11.7
index 4d9544c2be36..49bc589c79b2 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.7
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/polled_camera
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.7.tar.gz -> image_common-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd79875c1099151568898b58fb3173fd
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.8 b/metadata/md5-cache/dev-ros/polled_camera-1.11.8
index c97db90a6378..47ee27c78647 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.8
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/polled_camera
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.8.tar.gz -> image_common-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd79875c1099151568898b58fb3173fd
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.9 b/metadata/md5-cache/dev-ros/polled_camera-1.11.9
index 4c451a9ca27f..c67d4f8a654d 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.9
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/polled_camera
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.9.tar.gz -> image_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd79875c1099151568898b58fb3173fd
diff --git a/metadata/md5-cache/dev-ros/polled_camera-9999 b/metadata/md5-cache/dev-ros/polled_camera-9999
index 06925158013e..7b356449be5f 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/polled_camera
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bd79875c1099151568898b58fb3173fd
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
index 024d4ebfcf9e..212e0bc02a39 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
index 4e030f8573e2..dbf4ec1cebb7 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
index 6c5e09e758db..8c4a85fc2416 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
index 48bc2880e837..2af9e1eb3d89 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
index f15612a8947d..d835d7e2c7eb 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
index c597c2c982ed..04ba8d6e8af8 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
index 09baeae49b9a..edbc409902c5 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_dashboard_aggregator
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5937ae9db85955b48d2374f0009e9afa
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.11.14 b/metadata/md5-cache/dev-ros/pr2_description-1.11.14
index a3c2afaa17ff..e6e7a7d05f4b 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.11.14
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_description
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=443ed1b5d905c9d68513b5f8c8054633
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.0 b/metadata/md5-cache/dev-ros/pr2_description-1.12.0
index f49627777fae..b68697675b0d 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_description
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=443ed1b5d905c9d68513b5f8c8054633
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index 390bca092d37..2e4e97bb6e45 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_description
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/xacro[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=443ed1b5d905c9d68513b5f8c8054633
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.10 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
index d64ec3642a34..edffbe0710dd 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.11 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
index 9d0bfc82edeb..7eeadcb30b57 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.13 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
index 60fe8d381055..0a9d0f64c95c 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.14 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
index e1201c12b1aa..fb28baa6ac35 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.9 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
index da210ca08610..1ec9762d2a31 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.0 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
index faa0da71a106..f88a74a2c582 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-9999 b/metadata/md5-cache/dev-ros/pr2_machine-9999
index cf0257872715..fdaf5af413fd 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_machine
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9527b651ee25e3066cf43a6967180e8c
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.10 b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.10
index 2d4bc4437784..3009f643700f 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.10
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.11 b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.11
index 670bed04f64b..98b6ff99a4e7 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.11
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.11
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.13 b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.13
index ed7d28f65416..f75c4ca91eac 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.13
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.14 b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.14
index e5ca31a22df7..9923ce2af0dc 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.14
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.9 b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.9
index 86347de2bb66..78d3e9ad33d8 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.11.9
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.11.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
index 5e42fdcbeac7..91dc3c3eb933 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-9999 b/metadata/md5-cache/dev-ros/pr2_msgs-9999
index 97e8d26bf26c..ea890244e726 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pr2_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=02e4bc50b05cb0e811638959fdacd726
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.1 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.1
index 05dfa92c11c6..2ccdc49b4d4c 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.1
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/python_qt_binding
@@ -10,5 +10,5 @@ RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.1.tar.gz -> python_qt_binding-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bba3eb68af64358cd3fb040f3b17d148
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-9999 b/metadata/md5-cache/dev-ros/python_qt_binding-9999
index dcd0d70c786d..42a6312b8288 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/python_qt_binding
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bba3eb68af64358cd3fb040f3b17d148
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29
index e7f2ac747184..d05262b05822 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3707353b45f5dad454e0793aec03eed
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30
index abc5258037c8..d008e3c0c08a 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.2.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3707353b45f5dad454e0793aec03eed
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0
index 08633c94bd0a..f928caf5ff9b 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8b62e1d6fa30ff53bdb19d1aef523cf
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1
index c5f5c86ca5e3..c32e8c982c1e 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8b62e1d6fa30ff53bdb19d1aef523cf
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2
index 276151f10c26..bbfe4669052a 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8b62e1d6fa30ff53bdb19d1aef523cf
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3 b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3
index 21a9ba339203..2b7e18a60e68 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -10,5 +10,5 @@ RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c5234916f8c9738fe95869e0c72c2a7
diff --git a/metadata/md5-cache/dev-ros/qt_dotgraph-9999 b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
index e9490a487c4f..c2db88e2fe9e 100644
--- a/metadata/md5-cache/dev-ros/qt_dotgraph-9999
+++ b/metadata/md5-cache/dev-ros/qt_dotgraph-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygraphviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Helpers to work with dot graphs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_dotgraph
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=media-gfx/pydot[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8b62e1d6fa30ff53bdb19d1aef523cf
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.2.29 b/metadata/md5-cache/dev-ros/qt_gui-0.2.29
index 494e95ed82e5..93e49a0f2164 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.2.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=915d4240c833ef81879101818f312de4
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.2.30 b/metadata/md5-cache/dev-ros/qt_gui-0.2.30
index da8c30569ebb..58ab027fc0d9 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.2.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=915d4240c833ef81879101818f312de4
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.0 b/metadata/md5-cache/dev-ros/qt_gui-0.3.0
index aef168562b31..5bc15ec2d0cd 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27d5b6b6493f5bff824cdbd4ca389248
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.1 b/metadata/md5-cache/dev-ros/qt_gui-0.3.1
index 0f9d3f996f42..bea9d2823663 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27d5b6b6493f5bff824cdbd4ca389248
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.2 b/metadata/md5-cache/dev-ros/qt_gui-0.3.2
index c5bce6500263..4511228050e6 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27d5b6b6493f5bff824cdbd4ca389248
diff --git a/metadata/md5-cache/dev-ros/qt_gui-0.3.3 b/metadata/md5-cache/dev-ros/qt_gui-0.3.3
index c3f397907c53..2d12954cd4c4 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_gui-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edb1633ae1078e875ae5bc28455be333
diff --git a/metadata/md5-cache/dev-ros/qt_gui-9999 b/metadata/md5-cache/dev-ros/qt_gui-9999
index aee4959b74b8..b205e0933a75 100644
--- a/metadata/md5-cache/dev-ros/qt_gui-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS infrastructure for an integrated graphical user interface based on Qt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:4 dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=27d5b6b6493f5bff824cdbd4ca389248
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29 b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29
index bc4cbd44dba2..54dd2ec0e174 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea1f7f50b6ede5c46cf46e89baf0206b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30 b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30
index aa7a474c8ad1..47a74ae86c44 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.2.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea1f7f50b6ede5c46cf46e89baf0206b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0
index f118a0b7c8be..f1e299e51466 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73208e7db0e548922598d2e4b0ace31b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1
index 7e445cc7a569..fd56b4e3074d 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73208e7db0e548922598d2e4b0ace31b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2
index c11f4679031d..2fbdc356ab11 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73208e7db0e548922598d2e4b0ace31b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3 b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
index f83191ae680c..b2181ffbd70b 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3a1367cc07fa7abad943719ac1e32219
diff --git a/metadata/md5-cache/dev-ros/qt_gui_app-9999 b/metadata/md5-cache/dev-ros/qt_gui_app-9999
index d6a0343a1cc3..7e86f3ffc4b9 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_app-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_app-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_app
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73208e7db0e548922598d2e4b0ace31b
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.2 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.2
index 212c859f74fb..358f57a4773f 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_cpp
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15a1684c694e2f7ea71120495cff5db9
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.3 b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.3
index f5a526983d2e..38e875b767af 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_cpp
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d6c584906f51f33e241a30b33b372c2
diff --git a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
index 2efb05b5e15b..a5f4c83fa639 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_cpp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Foundation for C++-bindings for dev-ros/qt_gui and creates bindings for every generator available
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_cpp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtwidgets:5 >=dev-ros/pluginlib-1.9.23 >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/tinyxml >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15a1684c694e2f7ea71120495cff5db9
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29
index edaecc48764d..980623fbcf22 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.29
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.29.tar.gz -> qt_gui_core-0.2.29.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fedc1c1d6df649437a69f3725fd3a7e8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
index 67c08251feb1..b109607e8386 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.2.30.tar.gz -> qt_gui_core-0.2.30.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fedc1c1d6df649437a69f3725fd3a7e8
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0
index 60bf2b6c7e55..85ed007ccc70 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.0.tar.gz -> qt_gui_core-0.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b7dfe4f785a1849f1a5775028bb3df
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
index 73ddf27d6bac..9627778f7194 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.1.tar.gz -> qt_gui_core-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b7dfe4f785a1849f1a5775028bb3df
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2
index 21ac32c0e66d..879e5c703901 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.2.tar.gz -> qt_gui_core-0.3.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b7dfe4f785a1849f1a5775028bb3df
diff --git a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3 b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3
index c760b8cfaf74..0dbad6db742d 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/qt_gui_core/archive/0.3.3.tar.gz -> qt_gui_core-0.3.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e20f2387b6b24696a5ab4c1c9930ee80
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 69cedf36ff78..d63faf8c3317 100644
--- a/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
+++ b/metadata/md5-cache/dev-ros/qt_gui_py_common-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for ROS RQT GUI plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/qt_gui_py_common
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c4b7dfe4f785a1849f1a5775028bb3df
diff --git a/metadata/md5-cache/dev-ros/random_numbers-0.3.0 b/metadata/md5-cache/dev-ros/random_numbers-0.3.0
index 676594ff982e..cd9d33896333 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.0
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Wrappers for generating floating point values, integers, quaternions using boost libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/random_numbers
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.0.tar.gz -> random_numbers-0.3.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9719af25d39e259b3e8b9ec2ebba2de9
diff --git a/metadata/md5-cache/dev-ros/random_numbers-0.3.1 b/metadata/md5-cache/dev-ros/random_numbers-0.3.1
index 59b86bd5f75f..b05fb889b698 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-0.3.1
+++ b/metadata/md5-cache/dev-ros/random_numbers-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Wrappers for generating floating point values, integers, quaternions using boost libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/random_numbers
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-planning/random_numbers/archive/0.3.1.tar.gz -> random_numbers-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc7ef263165b374524625ef8bf604599
diff --git a/metadata/md5-cache/dev-ros/random_numbers-9999 b/metadata/md5-cache/dev-ros/random_numbers-9999
index cd6346df7324..c6970ef68430 100644
--- a/metadata/md5-cache/dev-ros/random_numbers-9999
+++ b/metadata/md5-cache/dev-ros/random_numbers-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Wrappers for generating floating point values, integers, quaternions using boost libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/random_numbers
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc7ef263165b374524625ef8bf604599
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.9.1 b/metadata/md5-cache/dev-ros/realtime_tools-1.9.1
index 880e75160c72..b1c8d08a1782 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.9.1
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/realtime_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.9.1.tar.gz -> realtime_tools-1.9.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=373ff062ab3a71d341762869d05149e1
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-1.9.2 b/metadata/md5-cache/dev-ros/realtime_tools-1.9.2
index 315f4bbe7026..873608d9f1b4 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-1.9.2
+++ b/metadata/md5-cache/dev-ros/realtime_tools-1.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/realtime_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros-controls/realtime_tools/archive/1.9.2.tar.gz -> realtime_tools-1.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc69a8d1a8569ecf36b7a301a7f35273
diff --git a/metadata/md5-cache/dev-ros/realtime_tools-9999 b/metadata/md5-cache/dev-ros/realtime_tools-9999
index 18c4891b0798..6802a4291ee1 100644
--- a/metadata/md5-cache/dev-ros/realtime_tools-9999
+++ b/metadata/md5-cache/dev-ros/realtime_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools that can be used from a hard realtime thread, without breaking the realtime behavior
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/realtime_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=373ff062ab3a71d341762869d05149e1
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-1.12.2 b/metadata/md5-cache/dev-ros/resource_retriever-1.12.2
index 39e13d5add32..7372a4a305ac 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-1.12.2
+++ b/metadata/md5-cache/dev-ros/resource_retriever-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Retrieves data from url-format files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/resource_retriever
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_s
 SLOT=0
 SRC_URI=https://github.com/ros/resource_retriever/archive/1.12.2.tar.gz -> resource_retriever-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=776adeb1cc1d02a25aba0dbb271ba1f4
diff --git a/metadata/md5-cache/dev-ros/resource_retriever-9999 b/metadata/md5-cache/dev-ros/resource_retriever-9999
index 586b1b7637c7..5b1419c684c2 100644
--- a/metadata/md5-cache/dev-ros/resource_retriever-9999
+++ b/metadata/md5-cache/dev-ros/resource_retriever-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Retrieves data from url-format files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/resource_retriever
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosconsole dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/curl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17b39ad6fe0aff3d19b0de5cdd6ac358
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0 b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0
index 280a57482f06..f157cda04d49 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rgbd_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf d
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.2.0.tar.gz -> rgbd_launch-2.2.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89ca24af5ac7149be9fdc51dffe38a3e
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1 b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1
index 7be011659f1d..f12b9173c8dd 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rgbd_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf d
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.2.1.tar.gz -> rgbd_launch-2.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89ca24af5ac7149be9fdc51dffe38a3e
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2 b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2
index 286f1044f2c3..30e08d4d7a3b 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-2.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rgbd_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf d
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rgbd_launch/archive/2.2.2.tar.gz -> rgbd_launch-2.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=684014003335f7bbfb701ca3642b2603
diff --git a/metadata/md5-cache/dev-ros/rgbd_launch-9999 b/metadata/md5-cache/dev-ros/rgbd_launch-9999
index ddf780de43db..34d40b9accc6 100644
--- a/metadata/md5-cache/dev-ros/rgbd_launch-9999
+++ b/metadata/md5-cache/dev-ros/rgbd_launch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Launch files to open an RGBD device
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rgbd_launch
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/tf dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=684014003335f7bbfb701ca3642b2603
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
index 8a6a999386d0..d541a76b3bb0 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5caec9b2fd5791bb6b8310e271a15ad
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999 b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
index 9108fea7cd12..c0b26b72b2e8 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5caec9b2fd5791bb6b8310e271a15ad
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 4bad176a0cf4..f46723081404 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,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A Simple Node to Publish the Robot's Position Relative to the Map using TFs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_pose_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev
 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
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edf7ed0db5caa0531f0a197cc6396fc1
diff --git a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999 b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
index aa02841b5b17..b4cab2a723c8 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_publisher-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=A Simple Node to Publish the Robot's Position Relative to the Map using TFs
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_pose_publisher
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edf7ed0db5caa0531f0a197cc6396fc1
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.2-r1 b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.2-r1
index cc5047860ca8..b9e08814ebbd 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.2-r1
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.2-r1
@@ -1,5 +1,5 @@
 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-1.12.3-r1 dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-1.12.3-r1 dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl dev-ros/roscpp de
 SLOT=0
 SRC_URI=https://github.com/ros/robot_state_publisher/archive/1.13.2.tar.gz -> robot_state_publisher-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d71ce867320fbad7f05af351c29b39f
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.3 b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.3
index 310f3c87a10e..d6c9f633eb03 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.3
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-1.13.3
@@ -1,5 +1,5 @@
 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-1.12.3-r1 dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-1.12.3-r1 dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_state_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/kdl_parser dev-cpp/eigen:3 sci-libs/orocos_kdl dev-ros/roscpp de
 SLOT=0
 SRC_URI=https://github.com/ros/robot_state_publisher/archive/1.13.3.tar.gz -> robot_state_publisher-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8d71ce867320fbad7f05af351c29b39f
diff --git a/metadata/md5-cache/dev-ros/robot_state_publisher-9999 b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
index b354b8f7047a..d90d7f74b44c 100644
--- a/metadata/md5-cache/dev-ros/robot_state_publisher-9999
+++ b/metadata/md5-cache/dev-ros/robot_state_publisher-9999
@@ -1,5 +1,5 @@
 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-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Package for publishing the state of a robot to tf
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_state_publisher
@@ -8,5 +8,5 @@ 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ac40267d7900a6a8513a400e27fe436
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.7.13 b/metadata/md5-cache/dev-ros/rosapi-0.7.13
index 29ac0f2df118..7a367bdb2523 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.7.13
+++ b/metadata/md5-cache/dev-ros/rosapi-0.7.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosapi
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.13.tar.gz -> rosbridge_suite-0.7.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bba7f8200ec01fe53d178807f72b1573
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.7.14 b/metadata/md5-cache/dev-ros/rosapi-0.7.14
index ba551628e260..df44cc30c263 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.7.14
+++ b/metadata/md5-cache/dev-ros/rosapi-0.7.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosapi
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.14.tar.gz -> rosbridge_suite-0.7.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bba7f8200ec01fe53d178807f72b1573
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.7.15 b/metadata/md5-cache/dev-ros/rosapi-0.7.15
index 99847db9c705..d264b5df1e74 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.7.15
+++ b/metadata/md5-cache/dev-ros/rosapi-0.7.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosapi
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.15.tar.gz -> rosbridge_suite-0.7.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0084b42fe5406381b025a24f56c1657c
diff --git a/metadata/md5-cache/dev-ros/rosapi-0.7.16 b/metadata/md5-cache/dev-ros/rosapi-0.7.16
index db98a9b591d7..02c6defd08e5 100644
--- a/metadata/md5-cache/dev-ros/rosapi-0.7.16
+++ b/metadata/md5-cache/dev-ros/rosapi-0.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosapi
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.16.tar.gz -> rosbridge_suite-0.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0084b42fe5406381b025a24f56c1657c
diff --git a/metadata/md5-cache/dev-ros/rosapi-9999 b/metadata/md5-cache/dev-ros/rosapi-9999
index ce05d97b8b5d..071e0787638b 100644
--- a/metadata/md5-cache/dev-ros/rosapi-9999
+++ b/metadata/md5-cache/dev-ros/rosapi-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Provides service calls for getting ros meta-information, like list of topics, services, params, etc.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosapi
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bba7f8200ec01fe53d178807f72b1573
diff --git a/metadata/md5-cache/dev-ros/rosauth-0.1.7 b/metadata/md5-cache/dev-ros/rosauth-0.1.7
index 526c8959b531..3806e6d2cc98 100644
--- a/metadata/md5-cache/dev-ros/rosauth-0.1.7
+++ b/metadata/md5-cache/dev-ros/rosauth-0.1.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl:0= test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl:0= test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Server Side tools for Authorization and Authentication of ROS Clients
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosauth
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_sing
 SLOT=0
 SRC_URI=https://github.com/WPI-RAIL/rosauth/archive/0.1.7.tar.gz -> rosauth-0.1.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41bffe00f67432ad3b62eba1036a61d0
diff --git a/metadata/md5-cache/dev-ros/rosauth-9999 b/metadata/md5-cache/dev-ros/rosauth-9999
index 457802a8d60e..da765c7872f0 100644
--- a/metadata/md5-cache/dev-ros/rosauth-9999
+++ b/metadata/md5-cache/dev-ros/rosauth-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl:0= test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl:0= test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Server Side tools for Authorization and Authentication of ROS Clients
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosauth
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/openssl:0= dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41bffe00f67432ad3b62eba1036a61d0
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.11.14 b/metadata/md5-cache/dev-ros/rosbag-1.11.14
index e31676a6ffd4..a08830719ed7 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosbag-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.11.15 b/metadata/md5-cache/dev-ros/rosbag-1.11.15
index 6e875266fb4f..13890473cc3d 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosbag-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.11.16 b/metadata/md5-cache/dev-ros/rosbag-1.11.16
index 97c5bfa51c33..1eeb9f887d02 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosbag-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.11.17 b/metadata/md5-cache/dev-ros/rosbag-1.11.17
index 8fa2b809d212..388f1d2086fb 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosbag-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.12.0 b/metadata/md5-cache/dev-ros/rosbag-1.12.0
index c11244b6cbde..f281c7036cca 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosbag-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.12.1 b/metadata/md5-cache/dev-ros/rosbag-1.12.1
index 3340d57030d5..49a2aa9289db 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosbag-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.12.2 b/metadata/md5-cache/dev-ros/rosbag-1.12.2
index 9aedba7eb35f..5cbb93cfe6ff 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosbag-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f75d167244076f6dc19252909f284724
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.12.4 b/metadata/md5-cache/dev-ros/rosbag-1.12.4
index 37cbcc6c1dc7..0ad55240789a 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosbag-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f75d167244076f6dc19252909f284724
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.12.5 b/metadata/md5-cache/dev-ros/rosbag-1.12.5
index 7f241fc46f91..d32c33a7ab3d 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosbag-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f75d167244076f6dc19252909f284724
diff --git a/metadata/md5-cache/dev-ros/rosbag-1.12.6 b/metadata/md5-cache/dev-ros/rosbag-1.12.6
index 11761d7dc6e0..01d0649cdb78 100644
--- a/metadata/md5-cache/dev-ros/rosbag-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosbag-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_t
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f75d167244076f6dc19252909f284724
diff --git a/metadata/md5-cache/dev-ros/rosbag-9999 b/metadata/md5-cache/dev-ros/rosbag-9999
index a5c356b17589..a98a453f4a2e 100644
--- a/metadata/md5-cache/dev-ros/rosbag-9999
+++ b/metadata/md5-cache/dev-ros/rosbag-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Set of tools for recording from and playing back to ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosbag_storage dev-ros/rosconsole dev-ros/roscpp dev-ros/topic_tools dev-ros/xmlrpcpp dev-libs/boost:= app-arch/bzip2 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] lz4? ( dev-ros/roslz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=df7f1202f07936e0dab234d0fc04c416
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.14 b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.14
index df4242236fd4..5872cd3eaaf1 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.15 b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.15
index 006b71939150..d737361b46c1 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.16 b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.16
index cb2d0a606eb7..576316b7da3d 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.17 b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.17
index c976fde5a44a..192b6a32c728 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.0 b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.0
index 6aed992aa6db..5ebd3855deb8 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.1 b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.1
index 91569689e5e3..0e37dcce67c1 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.2 b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.2
index 9472d25290c0..b2e31a7f74a0 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edbca42918af5b6ad8d35e95a38af61d
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.4 b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.4
index 0ca59d6ce3a3..e4b53397ed90 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edbca42918af5b6ad8d35e95a38af61d
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.5 b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.5
index 18f7fab8fcaa..513aa3391692 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edbca42918af5b6ad8d35e95a38af61d
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.6 b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.6
index 8f232d788092..53da12e999e4 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/roslz4 dev-libs/boost:= app-arch/bzip2 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/cpp_common dev-ros/roscpp_serialization
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=edbca42918af5b6ad8d35e95a38af61d
diff --git a/metadata/md5-cache/dev-ros/rosbag_storage-9999 b/metadata/md5-cache/dev-ros/rosbag_storage-9999
index 1570d0fbf2d7..3ac54d9544d4 100644
--- a/metadata/md5-cache/dev-ros/rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/rosbag_storage-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge 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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge 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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Set of tools for recording from and playing back ROS message
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbag_storage
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/console_bridge 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-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47b3c35a15fc90c2eb55051052456abc
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.12.3 b/metadata/md5-cache/dev-ros/rosbash-1.12.3
index 973c89caa125..793b050cf4ba 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.12.3
+++ b/metadata/md5-cache/dev-ros/rosbash-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a9926c369813397cc4ff9c9bc2a96eb5
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.12.5 b/metadata/md5-cache/dev-ros/rosbash-1.12.5
index 57e25b777623..a91ba20fccc1 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosbash-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a90009dab1d69f68027f98f9fb8395a6
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.13.1 b/metadata/md5-cache/dev-ros/rosbash-1.13.1
index b3e64f31fad1..5249bc62c937 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosbash-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a90009dab1d69f68027f98f9fb8395a6
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.13.2 b/metadata/md5-cache/dev-ros/rosbash-1.13.2
index d05555d6a0f3..3c7f39fad193 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosbash-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8baaeffa74277802ed6950b4558fac76
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.13.3 b/metadata/md5-cache/dev-ros/rosbash-1.13.3
index 1b25e0eb6c8c..8d789f07ee45 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.13.3
+++ b/metadata/md5-cache/dev-ros/rosbash-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8baaeffa74277802ed6950b4558fac76
diff --git a/metadata/md5-cache/dev-ros/rosbash-1.13.4 b/metadata/md5-cache/dev-ros/rosbash-1.13.4
index d44cbd824f1f..5be697e813be 100644
--- a/metadata/md5-cache/dev-ros/rosbash-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosbash-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8baaeffa74277802ed6950b4558fac76
diff --git a/metadata/md5-cache/dev-ros/rosbash-9999 b/metadata/md5-cache/dev-ros/rosbash-9999
index 2e8085b7ff8e..bc3b41782c28 100644
--- a/metadata/md5-cache/dev-ros/rosbash-9999
+++ b/metadata/md5-cache/dev-ros/rosbash-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Assorted shell commands for using ros with bash
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbash
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a90009dab1d69f68027f98f9fb8395a6
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.3 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.3
index 9cbecdba5e32..7f9ade7d1087 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.3
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e9884ea121b0f7ddeed973d5390b026
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.5 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.5
index 61101f0f71e4..4d4d7af8159e 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e9884ea121b0f7ddeed973d5390b026
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.1 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.1
index 7e89b1d1efb5..87f63a7f3a5b 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e9884ea121b0f7ddeed973d5390b026
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.2 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.2
index eb022df176c9..033ba57f41f4 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=647f4daaa8d355ec667c8192a5133f7c
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.3 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.3
index 892ff50acd08..753f7f5c6265 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.3
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=647f4daaa8d355ec667c8192a5133f7c
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.4 b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.4
index 0a7e45b29a33..662a4da34f6f 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=647f4daaa8d355ec667c8192a5133f7c
diff --git a/metadata/md5-cache/dev-ros/rosboost_cfg-9999 b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
index 2fc57f0dc4d5..74937da70eaa 100644
--- a/metadata/md5-cache/dev-ros/rosboost_cfg-9999
+++ b/metadata/md5-cache/dev-ros/rosboost_cfg-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool for determining cflags/lflags/etc. of boost on your system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosboost_cfg
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3e9884ea121b0f7ddeed973d5390b026
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.7.15 b/metadata/md5-cache/dev-ros/rosbridge_library-0.7.15
index 053ade07d671..280132cd93da 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.7.15
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.7.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_library
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.15.tar.gz -> rosbridge_suite-0.7.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ac7be36ec27c1edbf8c95b443101397
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-0.7.16 b/metadata/md5-cache/dev-ros/rosbridge_library-0.7.16
index cfc49952ca69..acf4cb8a0da0 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-0.7.16
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-0.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_library
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.16.tar.gz -> rosbridge_suite-0.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ac7be36ec27c1edbf8c95b443101397
diff --git a/metadata/md5-cache/dev-ros/rosbridge_library-9999 b/metadata/md5-cache/dev-ros/rosbridge_library-9999
index b4a83f3a1ca3..1fdc6a5fdacb 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_library-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_library-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy_tutorials[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/stereo_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/trajectory_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Core rosbridge package responsible for interpreting JSON and performing the appropriate ROS action
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_library
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4ac7be36ec27c1edbf8c95b443101397
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.13-r2 b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.13-r2
index ad0c10b4887a..86b776261bde 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.13-r2
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.13-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.13.tar.gz -> rosbridge_suite-0.7.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55a7e9d93cee659bf9c42b11066be733
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.14 b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.14
index ad28088c95c3..00f79b92a76d 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.14
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.14.tar.gz -> rosbridge_suite-0.7.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55a7e9d93cee659bf9c42b11066be733
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.15 b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.15
index 525eed8dcc94..ed9e55eb6dd4 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.15
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.15.tar.gz -> rosbridge_suite-0.7.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33fd5dad201e7fb71a9452469226bc19
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.16 b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.16
index fea2f750d84c..7ef29a444a0a 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-0.7.16
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-0.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/RobotWebTools/rosbridge_suite/archive/0.7.16.tar.gz -> rosbridge_suite-0.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=33fd5dad201e7fb71a9452469226bc19
diff --git a/metadata/md5-cache/dev-ros/rosbridge_server-9999 b/metadata/md5-cache/dev-ros/rosbridge_server-9999
index e5ca0465a34f..8c403e3355b2 100644
--- a/metadata/md5-cache/dev-ros/rosbridge_server-9999
+++ b/metadata/md5-cache/dev-ros/rosbridge_server-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A WebSocket interface to rosbridge
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbridge_server
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosapi[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbridge_library[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosauth[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] www-servers/tornado[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55a7e9d93cee659bf9c42b11066be733
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.12.3 b/metadata/md5-cache/dev-ros/rosbuild-1.12.3
index 4133db8976fb..f5749743f87f 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.12.3
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1147d7971ee1a3cd25e3af0bc376ec9
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.12.5 b/metadata/md5-cache/dev-ros/rosbuild-1.12.5
index 6213cec1d1ea..c050fc10c306 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1147d7971ee1a3cd25e3af0bc376ec9
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.13.1 b/metadata/md5-cache/dev-ros/rosbuild-1.13.1
index 720cb0fe59ca..c5687f96074d 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1147d7971ee1a3cd25e3af0bc376ec9
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.13.2 b/metadata/md5-cache/dev-ros/rosbuild-1.13.2
index 1dddf0c97007..9f61116e26d9 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=824f44195c7d57f35b8aa91f4f200931
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.13.3 b/metadata/md5-cache/dev-ros/rosbuild-1.13.3
index c0c0df09918a..da60ead2d600 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.13.3
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=824f44195c7d57f35b8aa91f4f200931
diff --git a/metadata/md5-cache/dev-ros/rosbuild-1.13.4 b/metadata/md5-cache/dev-ros/rosbuild-1.13.4
index e0a9b8bd4b4f..668bc591af89 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosbuild-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=824f44195c7d57f35b8aa91f4f200931
diff --git a/metadata/md5-cache/dev-ros/rosbuild-9999 b/metadata/md5-cache/dev-ros/rosbuild-9999
index 5bdb0701f776..0ad53b3a47e5 100644
--- a/metadata/md5-cache/dev-ros/rosbuild-9999
+++ b/metadata/md5-cache/dev-ros/rosbuild-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Scripts for managing the CMake-based build system for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosbuild
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a1147d7971ee1a3cd25e3af0bc376ec9
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.12.3 b/metadata/md5-cache/dev-ros/rosclean-1.12.3
index 9e508b5a404c..a53b30afc4fd 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.12.3
+++ b/metadata/md5-cache/dev-ros/rosclean-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13e772ccbade2f8b1cf9c0e87db4660
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.12.5 b/metadata/md5-cache/dev-ros/rosclean-1.12.5
index 383fe3b95a14..104e49b5aa81 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosclean-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13e772ccbade2f8b1cf9c0e87db4660
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.13.1 b/metadata/md5-cache/dev-ros/rosclean-1.13.1
index e78fc70c6203..6ca8659479c0 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosclean-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13e772ccbade2f8b1cf9c0e87db4660
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.13.2 b/metadata/md5-cache/dev-ros/rosclean-1.13.2
index 2d42a404ab15..348e1cad472b 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosclean-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=407bd9325a7fb03b2a5da395e8089472
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.13.3 b/metadata/md5-cache/dev-ros/rosclean-1.13.3
index 2815e5453223..7ef8da3ade91 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.13.3
+++ b/metadata/md5-cache/dev-ros/rosclean-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=407bd9325a7fb03b2a5da395e8089472
diff --git a/metadata/md5-cache/dev-ros/rosclean-1.13.4 b/metadata/md5-cache/dev-ros/rosclean-1.13.4
index 1d9a7973fce0..0aa207d6b5bc 100644
--- a/metadata/md5-cache/dev-ros/rosclean-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosclean-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=407bd9325a7fb03b2a5da395e8089472
diff --git a/metadata/md5-cache/dev-ros/rosclean-9999 b/metadata/md5-cache/dev-ros/rosclean-9999
index d838d4bc3877..bda6b47afde3 100644
--- a/metadata/md5-cache/dev-ros/rosclean-9999
+++ b/metadata/md5-cache/dev-ros/rosclean-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Cleanup filesystem resources (e.g. log files)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosclean
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13e772ccbade2f8b1cf9c0e87db4660
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.12.5 b/metadata/md5-cache/dev-ros/rosconsole-1.12.5
index 4f49ab865e87..19d5d59aba10 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.12.5
@@ -1,5 +1,5 @@
 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 ) ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS console output library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fb38d893eadf3d1902375124a522972
diff --git a/metadata/md5-cache/dev-ros/rosconsole-1.12.6 b/metadata/md5-cache/dev-ros/rosconsole-1.12.6
index 3d8e4b32c1ea..9e39812349f2 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosconsole-1.12.6
@@ -1,5 +1,5 @@
 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 ) ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS console output library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[thre
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ee89520167795d12ff4beea9074d8ef
diff --git a/metadata/md5-cache/dev-ros/rosconsole-9999 b/metadata/md5-cache/dev-ros/rosconsole-9999
index 84497ff5fa44..3809723a168c 100644
--- a/metadata/md5-cache/dev-ros/rosconsole-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole-9999
@@ -1,5 +1,5 @@
 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 ) ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/rosunit dev-libs/boost:=[threads] log4cxx? ( dev-libs/log4cxx ) !log4cxx? ( glog? ( dev-cpp/glog ) ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS console output library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole
@@ -8,5 +8,5 @@ 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 ) ) dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d8dcc3a43ee1840d85ea0701cacccd32
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.2 b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.2
index 5f15aeec9886..e0f045831ed9 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.2
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/rosconsole dev-util/catkin dev-python/em
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole_bridge/archive/0.4.2.tar.gz -> rosconsole_bridge-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75b8e0defe28aed0adbb39f8068c91b3
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.3 b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.3
index 9dfd0f9dab20..b290d984278d 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.3
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/rosconsole dev-util/catkin dev-python/em
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole_bridge/archive/0.4.3.tar.gz -> rosconsole_bridge-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4550c15dd06a341d5ca293ea4cd3a3c5
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.4 b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.4
index 7c3e8926d376..09b12856c7e1 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.4
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/console_bridge dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole_bridge
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/console_bridge dev-ros/rosconsole dev-util/catkin dev-python/em
 SLOT=0
 SRC_URI=https://github.com/ros/rosconsole_bridge/archive/0.4.4.tar.gz -> rosconsole_bridge-0.4.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4550c15dd06a341d5ca293ea4cd3a3c5
diff --git a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999 b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
index 24cd4ac08b04..36241979a353 100644
--- a/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
+++ b/metadata/md5-cache/dev-ros/rosconsole_bridge-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/console_bridge dev-ros/rosconsole >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/console_bridge dev-ros/rosconsole >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Connects console_bridge-based logging to rosconsole-based logging
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosconsole_bridge
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/console_bridge dev-ros/rosconsole dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4550c15dd06a341d5ca293ea4cd3a3c5
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.11.14 b/metadata/md5-cache/dev-ros/roscpp-1.11.14
index 39593dca6230..4f637bc27da1 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.11.14
+++ b/metadata/md5-cache/dev-ros/roscpp-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.11.15 b/metadata/md5-cache/dev-ros/roscpp-1.11.15
index 34014cab179a..f81342343578 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.11.15
+++ b/metadata/md5-cache/dev-ros/roscpp-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.11.16 b/metadata/md5-cache/dev-ros/roscpp-1.11.16
index 975de8000c67..fcd5360554bf 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.11.16
+++ b/metadata/md5-cache/dev-ros/roscpp-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.11.17 b/metadata/md5-cache/dev-ros/roscpp-1.11.17
index 36d6dac90f42..21929a5f1fd1 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.11.17
+++ b/metadata/md5-cache/dev-ros/roscpp-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.12.0 b/metadata/md5-cache/dev-ros/roscpp-1.12.0
index 6e838b71898d..954ef442609b 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.12.0
+++ b/metadata/md5-cache/dev-ros/roscpp-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.12.1 b/metadata/md5-cache/dev-ros/roscpp-1.12.1
index 616f84608d8b..957e7d18aecf 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.12.1
+++ b/metadata/md5-cache/dev-ros/roscpp-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.12.2 b/metadata/md5-cache/dev-ros/roscpp-1.12.2
index 799afab474ff..d1040e4ac210 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.12.2
+++ b/metadata/md5-cache/dev-ros/roscpp-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=19120e7f5371ee93e6862505fd0acf59
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.12.4 b/metadata/md5-cache/dev-ros/roscpp-1.12.4
index 022e120a008d..c3db77cabc0e 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.12.4
+++ b/metadata/md5-cache/dev-ros/roscpp-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=19120e7f5371ee93e6862505fd0acf59
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.12.5 b/metadata/md5-cache/dev-ros/roscpp-1.12.5
index 6ce7c0d1b42f..8f830911587b 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.12.5
+++ b/metadata/md5-cache/dev-ros/roscpp-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=19120e7f5371ee93e6862505fd0acf59
diff --git a/metadata/md5-cache/dev-ros/roscpp-1.12.6 b/metadata/md5-cache/dev-ros/roscpp-1.12.6
index 7e2707163e0b..fc74b3cbbfa0 100644
--- a/metadata/md5-cache/dev-ros/roscpp-1.12.6
+++ b/metadata/md5-cache/dev-ros/roscpp-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-ros/roscpp_traits dev-ros/rostime dev-ros/xmlrpcpp dev-libs/boost:= dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp_serialization dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=19120e7f5371ee93e6862505fd0acf59
diff --git a/metadata/md5-cache/dev-ros/roscpp-9999 b/metadata/md5-cache/dev-ros/roscpp-9999
index 5a3dfcd8ac98..892797f65fe1 100644
--- a/metadata/md5-cache/dev-ros/roscpp-9999
+++ b/metadata/md5-cache/dev-ros/roscpp-9999
@@ -1,5 +1,5 @@
 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=C++ implementation of ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp
@@ -8,5 +8,5 @@ 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(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74fb8307e112b57fd9da6c57b2b9163
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6
index 2a266c810cbb..8dd585f71c72 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Code for serialization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_serialization
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-util/catkin
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b013bac3a965504f77100e8b7785852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7
index 6f377e8d7c27..b4035e75ed05 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Code for serialization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_serialization
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-util/catkin
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b013bac3a965504f77100e8b7785852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0
index bab285907b86..9357049eafdc 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Code for serialization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_serialization
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-util/catkin
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b013bac3a965504f77100e8b7785852
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1 b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1
index 2371e9685611..4f71c682da1b 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Code for serialization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_serialization
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-util/catkin
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7b21c945ccd329e5a3539c0263374bba
diff --git a/metadata/md5-cache/dev-ros/roscpp_serialization-9999 b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
index 758ee493b3e4..3f68df2fb257 100644
--- a/metadata/md5-cache/dev-ros/roscpp_serialization-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_serialization-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Code for serialization
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_serialization
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b013bac3a965504f77100e8b7785852
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6 b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
index 0694fa619b42..4117854ff1db 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Message traits code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_traits
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ce594a0c3bfb287f6a318761e648c52
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7 b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7
index 3f5ff45ad1e5..007dc054657e 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Message traits code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_traits
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ce594a0c3bfb287f6a318761e648c52
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0
index 9df3333d03c8..c302cc86bf09 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Message traits code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_traits
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ce594a0c3bfb287f6a318761e648c52
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1 b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1
index 021cd95ca3e5..f187aa8e38df 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Message traits code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_traits
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eb04993bfb31d73ca95fca271f117960
diff --git a/metadata/md5-cache/dev-ros/roscpp_traits-9999 b/metadata/md5-cache/dev-ros/roscpp_traits-9999
index c2bbf696d789..c27adad3627c 100644
--- a/metadata/md5-cache/dev-ros/roscpp_traits-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_traits-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common dev-ros/rostime >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common dev-ros/rostime >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Message traits code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_traits
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ce594a0c3bfb287f6a318761e648c52
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1
index 1bbbce5ab206..ddb1d80cad79 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.6.1
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.6.1.tar.gz -> ros_tutorials-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11def6086188c34224e5dcc3cbefee28
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
index b6d7da72a2a8..a548bb65565b 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.0
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.0.tar.gz -> ros_tutorials-0.7.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11def6086188c34224e5dcc3cbefee28
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1 b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1
index 2e57111ffd03..9650f7fd122f 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-0.7.1
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/roscons
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.1.tar.gz -> ros_tutorials-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=44559534273e67ca7bcfdac31f114958
diff --git a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999 b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
index 44ac1ef7f652..99177fb9bcda 100644
--- a/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/roscpp_tutorials-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscpp_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/rostime dev-ros/roscpp dev-ros/rosconsole dev-ros/roscpp_serialization dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11def6086188c34224e5dcc3cbefee28
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.12.3 b/metadata/md5-cache/dev-ros/roscreate-1.12.3
index 51afa61643d4..b8146dcf695c 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.12.3
+++ b/metadata/md5-cache/dev-ros/roscreate-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=884305c7064bf021ee5840c02ae89e99
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.12.5 b/metadata/md5-cache/dev-ros/roscreate-1.12.5
index 01a73c36c0fd..3bdc615e3083 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.12.5
+++ b/metadata/md5-cache/dev-ros/roscreate-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=884305c7064bf021ee5840c02ae89e99
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.13.1 b/metadata/md5-cache/dev-ros/roscreate-1.13.1
index 84dd259023e8..1e3f5534f84d 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.13.1
+++ b/metadata/md5-cache/dev-ros/roscreate-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=884305c7064bf021ee5840c02ae89e99
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.13.2 b/metadata/md5-cache/dev-ros/roscreate-1.13.2
index 99b70598dfab..0838e82edaa0 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.13.2
+++ b/metadata/md5-cache/dev-ros/roscreate-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c26a360951b7696a95299cf4228c2f84
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.13.3 b/metadata/md5-cache/dev-ros/roscreate-1.13.3
index be4adce49560..a48767475b81 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.13.3
+++ b/metadata/md5-cache/dev-ros/roscreate-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c26a360951b7696a95299cf4228c2f84
diff --git a/metadata/md5-cache/dev-ros/roscreate-1.13.4 b/metadata/md5-cache/dev-ros/roscreate-1.13.4
index 9781b9377c7f..3250f8fbb11e 100644
--- a/metadata/md5-cache/dev-ros/roscreate-1.13.4
+++ b/metadata/md5-cache/dev-ros/roscreate-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c26a360951b7696a95299cf4228c2f84
diff --git a/metadata/md5-cache/dev-ros/roscreate-9999 b/metadata/md5-cache/dev-ros/roscreate-9999
index e2f5c6a44cde..45474e38a734 100644
--- a/metadata/md5-cache/dev-ros/roscreate-9999
+++ b/metadata/md5-cache/dev-ros/roscreate-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Tool that assists in the creation of ROS filesystem resources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roscreate
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=884305c7064bf021ee5840c02ae89e99
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.11.14 b/metadata/md5-cache/dev-ros/rosgraph-1.11.14
index 1a83e8a9266e..3256dbe3fd44 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41f88da949faa5c92ef369703301b516
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.11.15 b/metadata/md5-cache/dev-ros/rosgraph-1.11.15
index 59484e2cebc4..2e05834173f1 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b76f3ee029afacc1834fb7806ca95
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.11.16 b/metadata/md5-cache/dev-ros/rosgraph-1.11.16
index 93e04b012cef..d2ed1f75bac5 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b76f3ee029afacc1834fb7806ca95
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.11.17 b/metadata/md5-cache/dev-ros/rosgraph-1.11.17
index 57362f55327f..008155020c4e 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b76f3ee029afacc1834fb7806ca95
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.12.0 b/metadata/md5-cache/dev-ros/rosgraph-1.12.0
index 19f0f769681e..aa6cf82137a8 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b76f3ee029afacc1834fb7806ca95
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.12.1 b/metadata/md5-cache/dev-ros/rosgraph-1.12.1
index 160ef506e15d..3fd0bd281ccd 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b76f3ee029afacc1834fb7806ca95
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.12.2 b/metadata/md5-cache/dev-ros/rosgraph-1.12.2
index e8ced47383b4..8a21bd7aa402 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8fc334186b7676879f937ea75f3c149d
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.12.4 b/metadata/md5-cache/dev-ros/rosgraph-1.12.4
index 2a36688d9901..6cc30dc92c76 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8fc334186b7676879f937ea75f3c149d
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.12.5 b/metadata/md5-cache/dev-ros/rosgraph-1.12.5
index 45bc139e87c2..0699eb0c3494 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8fc334186b7676879f937ea75f3c149d
diff --git a/metadata/md5-cache/dev-ros/rosgraph-1.12.6 b/metadata/md5-cache/dev-ros/rosgraph-1.12.6
index 56fe15c10590..fee422bbf64e 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosgraph-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8fc334186b7676879f937ea75f3c149d
diff --git a/metadata/md5-cache/dev-ros/rosgraph-9999 b/metadata/md5-cache/dev-ros/rosgraph-9999
index 246dd0813d3c..acc35fe729e6 100644
--- a/metadata/md5-cache/dev-ros/rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Prints information about the ROS Computation Graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/netifaces[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c84b76f3ee029afacc1834fb7806ca95
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.1 b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.1
index 3d9fec9ae1b0..dcd173cf8074 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.1
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.1.tar.gz -> ros_comm_msgs-1.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dbe4acc5d8635fabe28dd59b6c31991
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2 b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2
index ecc801960e7f..b7a861fdc4f6 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-1.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.2.tar.gz -> ros_comm_msgs-1.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dbe4acc5d8635fabe28dd59b6c31991
diff --git a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999 b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
index 13dcb025c154..5d4677062dca 100644
--- a/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosgraph_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Messages relating to ROS comm
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosgraph_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9dbe4acc5d8635fabe28dd59b6c31991
diff --git a/metadata/md5-cache/dev-ros/roslang-1.12.3 b/metadata/md5-cache/dev-ros/roslang-1.12.3
index cc085da9bd71..e102c4c7d5d1 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.12.3
+++ b/metadata/md5-cache/dev-ros/roslang-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78d8909e626c1cb24f664b647102067b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.12.5 b/metadata/md5-cache/dev-ros/roslang-1.12.5
index ccc283c59e1e..d61fe8287e6c 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.12.5
+++ b/metadata/md5-cache/dev-ros/roslang-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78d8909e626c1cb24f664b647102067b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.1 b/metadata/md5-cache/dev-ros/roslang-1.13.1
index 89c3632c150c..96c0b17aa234 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.1
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78d8909e626c1cb24f664b647102067b
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.2 b/metadata/md5-cache/dev-ros/roslang-1.13.2
index fa0260d416e9..a11ef4b9eee3 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.2
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8840d8139fa38c0312d21e165ae4c7b7
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.3 b/metadata/md5-cache/dev-ros/roslang-1.13.3
index 2f75a6b18c79..b76a98295c6f 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.3
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8840d8139fa38c0312d21e165ae4c7b7
diff --git a/metadata/md5-cache/dev-ros/roslang-1.13.4 b/metadata/md5-cache/dev-ros/roslang-1.13.4
index 43caa8e3bd67..c3f912a700f9 100644
--- a/metadata/md5-cache/dev-ros/roslang-1.13.4
+++ b/metadata/md5-cache/dev-ros/roslang-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8840d8139fa38c0312d21e165ae4c7b7
diff --git a/metadata/md5-cache/dev-ros/roslang-9999 b/metadata/md5-cache/dev-ros/roslang-9999
index 8c0323162f13..8ac6c9fcc30d 100644
--- a/metadata/md5-cache/dev-ros/roslang-9999
+++ b/metadata/md5-cache/dev-ros/roslang-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Common package for all ROS client libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslang
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78d8909e626c1cb24f664b647102067b
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.11.16-r1 b/metadata/md5-cache/dev-ros/roslaunch-1.11.16-r1
index e6329032aefd..9d0e2632fbf7 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.11.16-r1
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.11.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=227e559a616344b5dc41a50ddb13aa35
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.11.17 b/metadata/md5-cache/dev-ros/roslaunch-1.11.17
index 94453dd358ab..872ab1164ea3 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.11.17
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=227e559a616344b5dc41a50ddb13aa35
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.12.0 b/metadata/md5-cache/dev-ros/roslaunch-1.12.0
index b457e792ca91..f433b20bff73 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.12.0
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=227e559a616344b5dc41a50ddb13aa35
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.12.1 b/metadata/md5-cache/dev-ros/roslaunch-1.12.1
index 12cc570090ce..0496e85aeac0 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.12.1
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=227e559a616344b5dc41a50ddb13aa35
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.12.2 b/metadata/md5-cache/dev-ros/roslaunch-1.12.2
index a4e32e93ce8a..ed41dfce242f 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.12.2
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8583ee1a11836717b70062aa90625d03
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.12.4 b/metadata/md5-cache/dev-ros/roslaunch-1.12.4
index 539b3d7118f3..dca1ff2a36ca 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.12.4
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8583ee1a11836717b70062aa90625d03
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.12.5 b/metadata/md5-cache/dev-ros/roslaunch-1.12.5
index ad14ca71c414..7d04e0f4b045 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.12.5
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8583ee1a11836717b70062aa90625d03
diff --git a/metadata/md5-cache/dev-ros/roslaunch-1.12.6 b/metadata/md5-cache/dev-ros/roslaunch-1.12.6
index 8d6230353b10..759c8d1d7a67 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-1.12.6
+++ b/metadata/md5-cache/dev-ros/roslaunch-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=pkg_preinst:- src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8583ee1a11836717b70062aa90625d03
diff --git a/metadata/md5-cache/dev-ros/roslaunch-9999 b/metadata/md5-cache/dev-ros/roslaunch-9999
index b0e93b84b5af..9d92079b9d29 100644
--- a/metadata/md5-cache/dev-ros/roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/roslaunch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install preinst prepare test unpack
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout test? ( dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for easily launching multiple ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslaunch
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosclean[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosout dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=pkg_preinst:- src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=227e559a616344b5dc41a50ddb13aa35
diff --git a/metadata/md5-cache/dev-ros/roslib-1.12.3 b/metadata/md5-cache/dev-ros/roslib-1.12.3
index c29768db676c..44375d83a4ab 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.12.3
+++ b/metadata/md5-cache/dev-ros/roslib-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7be969336e4cddbc1722f2058304cf7
diff --git a/metadata/md5-cache/dev-ros/roslib-1.12.5 b/metadata/md5-cache/dev-ros/roslib-1.12.5
index 2420757c2b9f..8ecea7524362 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.12.5
+++ b/metadata/md5-cache/dev-ros/roslib-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4e1a332ebfa135771b399fb853c0dfe0
diff --git a/metadata/md5-cache/dev-ros/roslib-1.13.1 b/metadata/md5-cache/dev-ros/roslib-1.13.1
index e5ccadd5cdd1..081fb1fcf381 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.13.1
+++ b/metadata/md5-cache/dev-ros/roslib-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26f6470007a99165731f9536b8b61094
diff --git a/metadata/md5-cache/dev-ros/roslib-1.13.2 b/metadata/md5-cache/dev-ros/roslib-1.13.2
index b225a7d6b742..c264b6a9647c 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.13.2
+++ b/metadata/md5-cache/dev-ros/roslib-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5250bd41d2f9ebb68bde93d9fca63e79
diff --git a/metadata/md5-cache/dev-ros/roslib-1.13.3 b/metadata/md5-cache/dev-ros/roslib-1.13.3
index d19bcd90cb09..29a84339d62a 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.13.3
+++ b/metadata/md5-cache/dev-ros/roslib-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5250bd41d2f9ebb68bde93d9fca63e79
diff --git a/metadata/md5-cache/dev-ros/roslib-1.13.4 b/metadata/md5-cache/dev-ros/roslib-1.13.4
index c14bed2e456a..bb69f7b6a0e4 100644
--- a/metadata/md5-cache/dev-ros/roslib-1.13.4
+++ b/metadata/md5-cache/dev-ros/roslib-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5250bd41d2f9ebb68bde93d9fca63e79
diff --git a/metadata/md5-cache/dev-ros/roslib-9999 b/metadata/md5-cache/dev-ros/roslib-9999
index d8410b2bba30..fc598eb96c5d 100644
--- a/metadata/md5-cache/dev-ros/roslib-9999
+++ b/metadata/md5-cache/dev-ros/roslib-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Base dependencies and support libraries for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslib
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-python/rospkg-1.0.37[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/boost:=[threads] dev-ros/rospack dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26f6470007a99165731f9536b8b61094
diff --git a/metadata/md5-cache/dev-ros/roslint-0.10.0 b/metadata/md5-cache/dev-ros/roslint-0.10.0
index 4500d9d9c41c..e8d9c97f8372 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.10.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Performs static checking of Python or C++ source code for errors and standards compliance
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslint
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/roslint/archive/0.10.0.tar.gz -> roslint-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f15f231dbf2d24c74a0a232ab33d2ef9
diff --git a/metadata/md5-cache/dev-ros/roslint-0.11.0 b/metadata/md5-cache/dev-ros/roslint-0.11.0
index 45e63d390dee..270264eea3df 100644
--- a/metadata/md5-cache/dev-ros/roslint-0.11.0
+++ b/metadata/md5-cache/dev-ros/roslint-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Performs static checking of Python or C++ source code for errors and standards compliance
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslint
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/roslint/archive/0.11.0.tar.gz -> roslint-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f15f231dbf2d24c74a0a232ab33d2ef9
diff --git a/metadata/md5-cache/dev-ros/roslint-9999 b/metadata/md5-cache/dev-ros/roslint-9999
index 823508920c1a..43e6813bb895 100644
--- a/metadata/md5-cache/dev-ros/roslint-9999
+++ b/metadata/md5-cache/dev-ros/roslint-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Performs static checking of Python or C++ source code for errors and standards compliance
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslint
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f15f231dbf2d24c74a0a232ab33d2ef9
diff --git a/metadata/md5-cache/dev-ros/roslisp-1.9.19 b/metadata/md5-cache/dev-ros/roslisp-1.9.19
index 491b303024d0..66b3aa517c17 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.19
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.19
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Lisp client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslisp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-
 SLOT=0
 SRC_URI=https://github.com/ros/roslisp/archive/1.9.19.tar.gz -> roslisp-1.9.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3848755d8b8e4f8f1dc671a1c65bf9cc
diff --git a/metadata/md5-cache/dev-ros/roslisp-1.9.20 b/metadata/md5-cache/dev-ros/roslisp-1.9.20
index 94e931de981f..23ded1244dbb 100644
--- a/metadata/md5-cache/dev-ros/roslisp-1.9.20
+++ b/metadata/md5-cache/dev-ros/roslisp-1.9.20
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Lisp client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslisp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-
 SLOT=0
 SRC_URI=https://github.com/ros/roslisp/archive/1.9.20.tar.gz -> roslisp-1.9.20.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3848755d8b8e4f8f1dc671a1c65bf9cc
diff --git a/metadata/md5-cache/dev-ros/roslisp-9999 b/metadata/md5-cache/dev-ros/roslisp-9999
index f090f77d0602..f976826acae7 100644
--- a/metadata/md5-cache/dev-ros/roslisp-9999
+++ b/metadata/md5-cache/dev-ros/roslisp-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Lisp client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslisp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslang dev-lisp/sbcl dev-ros/rospack dev-ros/rosgraph_msgs dev-ros/std_srvs dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3848755d8b8e4f8f1dc671a1c65bf9cc
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.11.14 b/metadata/md5-cache/dev-ros/roslz4-1.11.14
index 6b91bd7fab1e..f9aa44da79be 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.11.14
+++ b/metadata/md5-cache/dev-ros/roslz4-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.11.15 b/metadata/md5-cache/dev-ros/roslz4-1.11.15
index 768d28ce9d44..4188a99d3308 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.11.15
+++ b/metadata/md5-cache/dev-ros/roslz4-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.11.16 b/metadata/md5-cache/dev-ros/roslz4-1.11.16
index 2e038c3407e0..9626ea6de31a 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.11.16
+++ b/metadata/md5-cache/dev-ros/roslz4-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.11.17 b/metadata/md5-cache/dev-ros/roslz4-1.11.17
index 5e5b5f4aec11..bcafdc054629 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.11.17
+++ b/metadata/md5-cache/dev-ros/roslz4-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.12.0 b/metadata/md5-cache/dev-ros/roslz4-1.12.0
index 1e1f3a465277..94a8d5a93e32 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.12.0
+++ b/metadata/md5-cache/dev-ros/roslz4-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.12.1 b/metadata/md5-cache/dev-ros/roslz4-1.12.1
index 950aa6e60dd0..d7ed92a4d745 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.12.1
+++ b/metadata/md5-cache/dev-ros/roslz4-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.12.2 b/metadata/md5-cache/dev-ros/roslz4-1.12.2
index 9b67d5e00c3f..da8ffdc7dc15 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.12.2
+++ b/metadata/md5-cache/dev-ros/roslz4-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de6ffd26a62d4efa16bbaad8ba9c443
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.12.4 b/metadata/md5-cache/dev-ros/roslz4-1.12.4
index 393861ec255e..9fa9ade631f0 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.12.4
+++ b/metadata/md5-cache/dev-ros/roslz4-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de6ffd26a62d4efa16bbaad8ba9c443
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.12.5 b/metadata/md5-cache/dev-ros/roslz4-1.12.5
index fe46f78045de..bb98c109e564 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.12.5
+++ b/metadata/md5-cache/dev-ros/roslz4-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de6ffd26a62d4efa16bbaad8ba9c443
diff --git a/metadata/md5-cache/dev-ros/roslz4-1.12.6 b/metadata/md5-cache/dev-ros/roslz4-1.12.6
index 2cd37e7aef23..49eb6b89c068 100644
--- a/metadata/md5-cache/dev-ros/roslz4-1.12.6
+++ b/metadata/md5-cache/dev-ros/roslz4-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -10,5 +10,5 @@ RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de6ffd26a62d4efa16bbaad8ba9c443
diff --git a/metadata/md5-cache/dev-ros/roslz4-9999 b/metadata/md5-cache/dev-ros/roslz4-9999
index f0b16a684420..6fd5545143b5 100644
--- a/metadata/md5-cache/dev-ros/roslz4-9999
+++ b/metadata/md5-cache/dev-ros/roslz4-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=app-arch/lz4 test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Python and C++ implementation of the LZ4 streaming format
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roslz4
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=app-arch/lz4 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b578bd38dbfd92cbbe17f096ea52fd2d
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.12.3 b/metadata/md5-cache/dev-ros/rosmake-1.12.3
index d0ae3147a66d..0ba259c8a91c 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.12.3
+++ b/metadata/md5-cache/dev-ros/rosmake-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82549c7cfc9dd3e1dc3e21344cefc2e9
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.12.5 b/metadata/md5-cache/dev-ros/rosmake-1.12.5
index bd4e82cfc39b..a1ca3fab1115 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosmake-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82549c7cfc9dd3e1dc3e21344cefc2e9
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.13.1 b/metadata/md5-cache/dev-ros/rosmake-1.13.1
index a19b1bfa84ce..64fea213c324 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosmake-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82549c7cfc9dd3e1dc3e21344cefc2e9
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.13.2 b/metadata/md5-cache/dev-ros/rosmake-1.13.2
index 4455b975f44d..8e3883405e7d 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosmake-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc063d29d572797bf06b7c7b878aec39
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.13.3 b/metadata/md5-cache/dev-ros/rosmake-1.13.3
index f074cc438e61..e43982087e66 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.13.3
+++ b/metadata/md5-cache/dev-ros/rosmake-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc063d29d572797bf06b7c7b878aec39
diff --git a/metadata/md5-cache/dev-ros/rosmake-1.13.4 b/metadata/md5-cache/dev-ros/rosmake-1.13.4
index 4e6f43bc47f3..c9b8832c8eb1 100644
--- a/metadata/md5-cache/dev-ros/rosmake-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosmake-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc063d29d572797bf06b7c7b878aec39
diff --git a/metadata/md5-cache/dev-ros/rosmake-9999 b/metadata/md5-cache/dev-ros/rosmake-9999
index 4d7d5dffbb4a..d81f207f4c1c 100644
--- a/metadata/md5-cache/dev-ros/rosmake-9999
+++ b/metadata/md5-cache/dev-ros/rosmake-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS dependency aware build tool
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmake
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=82549c7cfc9dd3e1dc3e21344cefc2e9
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.12.1 b/metadata/md5-cache/dev-ros/rosmaster-1.12.1
index 354869969d7c..ea8609c48c3c 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS Master implementation
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05f311544a20f0f27a989c4952671f0b
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.12.2 b/metadata/md5-cache/dev-ros/rosmaster-1.12.2
index 8603384bbfe7..86483352c71e 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS Master implementation
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae871ef84a395d802eaa2a49e25bc0ae
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.12.4 b/metadata/md5-cache/dev-ros/rosmaster-1.12.4
index dd3c48c77b77..8386657c690e 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS Master implementation
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae871ef84a395d802eaa2a49e25bc0ae
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.12.5 b/metadata/md5-cache/dev-ros/rosmaster-1.12.5
index 19c4028b0f70..ee337d2a51a5 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS Master implementation
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae871ef84a395d802eaa2a49e25bc0ae
diff --git a/metadata/md5-cache/dev-ros/rosmaster-1.12.6 b/metadata/md5-cache/dev-ros/rosmaster-1.12.6
index 7de847679aaf..8472a3f95d80 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosmaster-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS Master implementation
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ae871ef84a395d802eaa2a49e25bc0ae
diff --git a/metadata/md5-cache/dev-ros/rosmaster-9999 b/metadata/md5-cache/dev-ros/rosmaster-9999
index 2a32a59c1260..83330e85c3f4 100644
--- a/metadata/md5-cache/dev-ros/rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/rosmaster-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=ROS Master implementation
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmaster
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=05f311544a20f0f27a989c4952671f0b
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.11.14 b/metadata/md5-cache/dev-ros/rosmsg-1.11.14
index 79186fbff3b2..ffaccf4a405d 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.11.15 b/metadata/md5-cache/dev-ros/rosmsg-1.11.15
index 90b68f1625fb..9d49b5534a9a 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.11.16 b/metadata/md5-cache/dev-ros/rosmsg-1.11.16
index 8776c4695554..8efd41c9fcd0 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.11.17 b/metadata/md5-cache/dev-ros/rosmsg-1.11.17
index 950614147d19..271d48aea1e5 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.12.0 b/metadata/md5-cache/dev-ros/rosmsg-1.12.0
index 6d1e3e420421..4f5a639dda1a 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.12.1 b/metadata/md5-cache/dev-ros/rosmsg-1.12.1
index f3b12296d9c7..a33906c3d825 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.12.2 b/metadata/md5-cache/dev-ros/rosmsg-1.12.2
index cc752efd2b17..65122f5ed75a 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd2649370a2b976f0de3c32ba3c710aa
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.12.4 b/metadata/md5-cache/dev-ros/rosmsg-1.12.4
index 9420361266e2..887a893ef644 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd2649370a2b976f0de3c32ba3c710aa
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.12.5 b/metadata/md5-cache/dev-ros/rosmsg-1.12.5
index 1e94c7565cdd..1e30c59ee08f 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd2649370a2b976f0de3c32ba3c710aa
diff --git a/metadata/md5-cache/dev-ros/rosmsg-1.12.6 b/metadata/md5-cache/dev-ros/rosmsg-1.12.6
index f2e25013cee6..0d2a10548cb3 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosmsg-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd2649370a2b976f0de3c32ba3c710aa
diff --git a/metadata/md5-cache/dev-ros/rosmsg-9999 b/metadata/md5-cache/dev-ros/rosmsg-9999
index 271a3b25702b..89cc66c98c1d 100644
--- a/metadata/md5-cache/dev-ros/rosmsg-9999
+++ b/metadata/md5-cache/dev-ros/rosmsg-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tools for displaying information about message and services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosmsg
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=15e2007c69d70e0e00f6b8ef25af53b5
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.11.14 b/metadata/md5-cache/dev-ros/rosnode-1.11.14
index 372129cb8120..42fefa6bdfb1 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosnode-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.11.15 b/metadata/md5-cache/dev-ros/rosnode-1.11.15
index 268e88a717e8..84124a15258b 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosnode-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.11.16 b/metadata/md5-cache/dev-ros/rosnode-1.11.16
index 1963c607c647..4eba1ce53a24 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosnode-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.11.17 b/metadata/md5-cache/dev-ros/rosnode-1.11.17
index 0089780b94b4..f2147741603c 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosnode-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.12.0 b/metadata/md5-cache/dev-ros/rosnode-1.12.0
index 4427be7f11ec..9dd6cb0d0772 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosnode-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.12.1 b/metadata/md5-cache/dev-ros/rosnode-1.12.1
index ba23176abb82..4a5e08fdfb00 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosnode-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.12.2 b/metadata/md5-cache/dev-ros/rosnode-1.12.2
index 25033dc9864f..7dc609304a4e 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosnode-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd50c5eb2ec59cb8f324f345c8cb4de0
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.12.4 b/metadata/md5-cache/dev-ros/rosnode-1.12.4
index 437d1d1c9e10..169c7c127aa1 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosnode-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd50c5eb2ec59cb8f324f345c8cb4de0
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.12.5 b/metadata/md5-cache/dev-ros/rosnode-1.12.5
index de2ada646b02..e6cabf82ae71 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosnode-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd50c5eb2ec59cb8f324f345c8cb4de0
diff --git a/metadata/md5-cache/dev-ros/rosnode-1.12.6 b/metadata/md5-cache/dev-ros/rosnode-1.12.6
index 0215d95f6640..8e9755e5deb0 100644
--- a/metadata/md5-cache/dev-ros/rosnode-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosnode-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cd50c5eb2ec59cb8f324f345c8cb4de0
diff --git a/metadata/md5-cache/dev-ros/rosnode-9999 b/metadata/md5-cache/dev-ros/rosnode-9999
index 3611b99585c1..821e55fbbb7e 100644
--- a/metadata/md5-cache/dev-ros/rosnode-9999
+++ b/metadata/md5-cache/dev-ros/rosnode-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosnode
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=77ff33c7fa608dcdbe120c5e45c25168
diff --git a/metadata/md5-cache/dev-ros/rosout-1.11.14 b/metadata/md5-cache/dev-ros/rosout-1.11.14
index 6cab4f583a13..c3a4921d7cf8 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosout-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rosout-1.11.15 b/metadata/md5-cache/dev-ros/rosout-1.11.15
index c92f25025f4a..464aca9873cd 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosout-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rosout-1.11.16 b/metadata/md5-cache/dev-ros/rosout-1.11.16
index da50e51bae03..f0f974036bbe 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosout-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rosout-1.11.17 b/metadata/md5-cache/dev-ros/rosout-1.11.17
index 62554f8e28b8..dc205229e21c 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosout-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rosout-1.12.0 b/metadata/md5-cache/dev-ros/rosout-1.12.0
index 7a25b238044c..3c3fd3c58520 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosout-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rosout-1.12.1 b/metadata/md5-cache/dev-ros/rosout-1.12.1
index 56a619038d64..7e6d50f00621 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosout-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rosout-1.12.2 b/metadata/md5-cache/dev-ros/rosout-1.12.2
index 88f73aed7f96..a8bf0b69df73 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosout-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ddc7cf7cea710ce8d7e62cf0ccbf567
diff --git a/metadata/md5-cache/dev-ros/rosout-1.12.4 b/metadata/md5-cache/dev-ros/rosout-1.12.4
index 894b07afe870..a22c2a666e22 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosout-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ddc7cf7cea710ce8d7e62cf0ccbf567
diff --git a/metadata/md5-cache/dev-ros/rosout-1.12.5 b/metadata/md5-cache/dev-ros/rosout-1.12.5
index 74723a35ca6b..7e6202d99f89 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosout-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ddc7cf7cea710ce8d7e62cf0ccbf567
diff --git a/metadata/md5-cache/dev-ros/rosout-1.12.6 b/metadata/md5-cache/dev-ros/rosout-1.12.6
index 4a143146fd2f..05713c52c03e 100644
--- a/metadata/md5-cache/dev-ros/rosout-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosout-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catki
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5ddc7cf7cea710ce8d7e62cf0ccbf567
diff --git a/metadata/md5-cache/dev-ros/rosout-9999 b/metadata/md5-cache/dev-ros/rosout-9999
index 79658b9c5b2a..f98d6fcc902e 100644
--- a/metadata/md5-cache/dev-ros/rosout-9999
+++ b/metadata/md5-cache/dev-ros/rosout-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=System-wide logging mechanism for messages sent to the /rosout topic
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosout
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ce4b8eeb6a00d94dabc9100a6843d97e
diff --git a/metadata/md5-cache/dev-ros/rospack-2.3.1-r1 b/metadata/md5-cache/dev-ros/rospack-2.3.1-r1
index 8abcf3218d7f..99fb997e3788 100644
--- a/metadata/md5-cache/dev-ros/rospack-2.3.1-r1
+++ b/metadata/md5-cache/dev-ros/rospack-2.3.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest dev-python/nose ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest dev-python/nose ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospack
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-libs/tinyxml dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/rospack/archive/2.3.1.tar.gz -> rospack-2.3.1.tar.gz
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbe6641b54d8d571080244a4e30a3694
diff --git a/metadata/md5-cache/dev-ros/rospack-9999 b/metadata/md5-cache/dev-ros/rospack-9999
index 3821e1fb90ca..49ebcab9e918 100644
--- a/metadata/md5-cache/dev-ros/rospack-9999
+++ b/metadata/md5-cache/dev-ros/rospack-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest dev-python/nose ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-cpp/gtest dev-python/nose ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Retrieves information about ROS packages available on the filesystem
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospack
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-libs/tinyxml dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=pkg_setup:python-single-r1 src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	python-single-r1	19a74c6b5c191723a997dc7e0cc6bb09	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cbe6641b54d8d571080244a4e30a3694
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.11.14 b/metadata/md5-cache/dev-ros/rosparam-1.11.14
index 40e77a309cab..01365e483601 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosparam-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.11.15 b/metadata/md5-cache/dev-ros/rosparam-1.11.15
index bfddffb9404e..b06c3cf82e70 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosparam-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.11.16 b/metadata/md5-cache/dev-ros/rosparam-1.11.16
index 772f9e408b98..2a5355285fde 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosparam-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.11.17 b/metadata/md5-cache/dev-ros/rosparam-1.11.17
index 949b7cfd6a39..f2f88167664d 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosparam-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.12.0 b/metadata/md5-cache/dev-ros/rosparam-1.12.0
index 13b63a4fe13e..fda91bf97070 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosparam-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.12.1 b/metadata/md5-cache/dev-ros/rosparam-1.12.1
index e41f4b4d58cf..b41d9c40615e 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosparam-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.12.2 b/metadata/md5-cache/dev-ros/rosparam-1.12.2
index 57bc87d4cd44..8a9df832a607 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosparam-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7806db92f364dc055446296ffcb2f67
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.12.4 b/metadata/md5-cache/dev-ros/rosparam-1.12.4
index 239bccd1d8b8..dae0e2eadf6b 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosparam-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7806db92f364dc055446296ffcb2f67
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.12.5 b/metadata/md5-cache/dev-ros/rosparam-1.12.5
index 5746c8fce2bb..ff1459416e6b 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosparam-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7806db92f364dc055446296ffcb2f67
diff --git a/metadata/md5-cache/dev-ros/rosparam-1.12.6 b/metadata/md5-cache/dev-ros/rosparam-1.12.6
index 4f85b2971e82..ec834e35e300 100644
--- a/metadata/md5-cache/dev-ros/rosparam-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosparam-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a7806db92f364dc055446296ffcb2f67
diff --git a/metadata/md5-cache/dev-ros/rosparam-9999 b/metadata/md5-cache/dev-ros/rosparam-9999
index 134e5ffb8fc4..b48ffa4d56d1 100644
--- a/metadata/md5-cache/dev-ros/rosparam-9999
+++ b/metadata/md5-cache/dev-ros/rosparam-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for getting and setting ROS Parameters on the parameter server
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosparam
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3328302e3369479851953e7447652771
diff --git a/metadata/md5-cache/dev-ros/rospy-1.11.14 b/metadata/md5-cache/dev-ros/rospy-1.11.14
index e60ded8e1795..1662e0947cae 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.11.14
+++ b/metadata/md5-cache/dev-ros/rospy-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy-1.11.15 b/metadata/md5-cache/dev-ros/rospy-1.11.15
index ba6098642ccc..c38071b7de5c 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.11.15
+++ b/metadata/md5-cache/dev-ros/rospy-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy-1.11.16 b/metadata/md5-cache/dev-ros/rospy-1.11.16
index c97f2a2223ac..d2f512daecff 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.11.16
+++ b/metadata/md5-cache/dev-ros/rospy-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy-1.11.17 b/metadata/md5-cache/dev-ros/rospy-1.11.17
index 1cddfcb8ba2e..e25ab8272296 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.11.17
+++ b/metadata/md5-cache/dev-ros/rospy-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy-1.12.0 b/metadata/md5-cache/dev-ros/rospy-1.12.0
index a6b9bdb70b89..dd33ff8ae15a 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.12.0
+++ b/metadata/md5-cache/dev-ros/rospy-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy-1.12.1 b/metadata/md5-cache/dev-ros/rospy-1.12.1
index f29b0ef02ac6..5b53a591d61d 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.12.1
+++ b/metadata/md5-cache/dev-ros/rospy-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy-1.12.2 b/metadata/md5-cache/dev-ros/rospy-1.12.2
index d79ad6852002..87644244811f 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.12.2
+++ b/metadata/md5-cache/dev-ros/rospy-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3aeb15571aabfb31b8a90b067d2aed83
diff --git a/metadata/md5-cache/dev-ros/rospy-1.12.4 b/metadata/md5-cache/dev-ros/rospy-1.12.4
index 118be0218835..76918c9d3e2f 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.12.4
+++ b/metadata/md5-cache/dev-ros/rospy-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3aeb15571aabfb31b8a90b067d2aed83
diff --git a/metadata/md5-cache/dev-ros/rospy-1.12.5 b/metadata/md5-cache/dev-ros/rospy-1.12.5
index 7668bc971b60..353ecbd10a63 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.12.5
+++ b/metadata/md5-cache/dev-ros/rospy-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3aeb15571aabfb31b8a90b067d2aed83
diff --git a/metadata/md5-cache/dev-ros/rospy-1.12.6 b/metadata/md5-cache/dev-ros/rospy-1.12.6
index d8a29b48c835..389e0abe1f98 100644
--- a/metadata/md5-cache/dev-ros/rospy-1.12.6
+++ b/metadata/md5-cache/dev-ros/rospy-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3aeb15571aabfb31b8a90b067d2aed83
diff --git a/metadata/md5-cache/dev-ros/rospy-9999 b/metadata/md5-cache/dev-ros/rospy-9999
index 6503162b8e4f..577a117dd43d 100644
--- a/metadata/md5-cache/dev-ros/rospy-9999
+++ b/metadata/md5-cache/dev-ros/rospy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4aabc53cb094a0bf2c06829a912e9220
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
index f3a089bee5b0..8db981a79c81 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.6.1.tar.gz -> ros_tutorials-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0327f6fec66c05672c1014057ec895a8
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
index cb3c936a7d70..0ca0e3f4dbb5 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.0.tar.gz -> ros_tutorials-0.7.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0327f6fec66c05672c1014057ec895a8
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1 b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1
index 5090e04aa4e8..7d7d754dfc8b 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.1.tar.gz -> ros_tutorials-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9ccfb1035b9e94d2f962578f3d6b2503
diff --git a/metadata/md5-cache/dev-ros/rospy_tutorials-9999 b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
index d15152ef735d..843130d6cec5 100644
--- a/metadata/md5-cache/dev-ros/rospy_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rospy_tutorials-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Attempts to show the features of ROS step-by-step, including using messages, servers, parameters
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rospy_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0327f6fec66c05672c1014057ec895a8
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1
index 1e185a87666d..6bbd3c07bf3a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_arduino
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d393de68c71a99cd072ca79c96de709b
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
index 6846eb7c2a03..ab97d7eae796 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_arduino
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af7a37bdae336e9da3878168d006b3f4
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3
index d55b7686b16b..63f301e8b747 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_arduino
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af7a37bdae336e9da3878168d006b3f4
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4
index 5d55cdcdb5ee..cf13da5bd4d3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_arduino
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af7a37bdae336e9da3878168d006b3f4
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5
index 876e4756d044..e130bc504b09 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_arduino
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=af7a37bdae336e9da3878168d006b3f4
diff --git a/metadata/md5-cache/dev-ros/rosserial_arduino-9999 b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
index a8c22a32c136..9c8faf4bf788 100644
--- a/metadata/md5-cache/dev-ros/rosserial_arduino-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_arduino-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Arduino/AVR Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_arduino
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d393de68c71a99cd072ca79c96de709b
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_client-0.7.1
index 89a424faefc5..601da01be162 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_client
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6618d83cdd0f139fc330f93bd93bd4b
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_client-0.7.2
index 8ac2fd91acb7..a1e35e311f2f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_client
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=225e10dc1147300d59bf69c4580b72a0
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_client-0.7.3
index aff20f99b807..74a2f72d63ad 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_client
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=225e10dc1147300d59bf69c4580b72a0
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_client-0.7.4
index 153bfc93c9f9..6fa0002dd280 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_client
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=225e10dc1147300d59bf69c4580b72a0
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_client-0.7.5
index afb09f220fdd..a83e43783ec9 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_client-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_client
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=225e10dc1147300d59bf69c4580b72a0
diff --git a/metadata/md5-cache/dev-ros/rosserial_client-9999 b/metadata/md5-cache/dev-ros/rosserial_client-9999
index aa0881fb0f1b..7928fa060e15 100644
--- a/metadata/md5-cache/dev-ros/rosserial_client-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_client-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Generalized client side source for rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_client
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d6618d83cdd0f139fc330f93bd93bd4b
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1
index 79d2975cfbc1..f75616a37f58 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_embeddedlinux
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f82b5927401f4507fb6003ab025681f1
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2
index 74931e200d41..f199e4ab93b3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_embeddedlinux
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f490f6164a5f258ed4440f00ac9c94
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3
index 7af678841758..8b40019bdbf9 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_embeddedlinux
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f490f6164a5f258ed4440f00ac9c94
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4
index 9d8b115180f2..0585bd962b8d 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_embeddedlinux
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f490f6164a5f258ed4440f00ac9c94
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5
index 2b91b8ed769d..b3920bab3c2a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_embeddedlinux
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e7f490f6164a5f258ed4440f00ac9c94
diff --git a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999 b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
index 34a46c949ec0..cb5ada113604 100644
--- a/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_embeddedlinux-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Embedded Linux Enviroments
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_embeddedlinux
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f82b5927401f4507fb6003ab025681f1
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.1
index f0ccde1cb0cb..c74accc1d233 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6640917e20876a94bb820c3e797347b9
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.2
index f65c09268376..7266c441e769 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2c952b5b632ee47e32438eb729f121b
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.3
index 61f9cda9ca92..8e7b36d64a2f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2c952b5b632ee47e32438eb729f121b
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.4
index 430917dabc4c..8dd2bd0385c0 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2c952b5b632ee47e32438eb729f121b
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.5
index 9dcfaec0e1d2..4bdc2345808b 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f2c952b5b632ee47e32438eb729f121b
diff --git a/metadata/md5-cache/dev-ros/rosserial_msgs-9999 b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
index 6fb931bcb23a..cb9f32454c13 100644
--- a/metadata/md5-cache/dev-ros/rosserial_msgs-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Messages for automatic topic configuration using rosserial
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6640917e20876a94bb820c3e797347b9
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.1
index 3736b46f1952..de3877ba85de 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_python
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e2ca725958670ef6924f5fb6f185486
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.2
index 52d23cc5c4b8..a0c8bf3592b3 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_python
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb9b236593273c21296353cc045fe8e5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.3
index a6678a62015d..373c843f29f1 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_python
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb9b236593273c21296353cc045fe8e5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.4
index 4e07b99dd791..fae99393f1ef 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_python
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb9b236593273c21296353cc045fe8e5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_python-0.7.5
index 2330db2be0a7..3a2e0eb87b4e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_python-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_python
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb9b236593273c21296353cc045fe8e5
diff --git a/metadata/md5-cache/dev-ros/rosserial_python-9999 b/metadata/md5-cache/dev-ros/rosserial_python-9999
index 17fee95eb249..addc95a95b60 100644
--- a/metadata/md5-cache/dev-ros/rosserial_python-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=A Python-based implementation of the ROS serial protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_python
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e2ca725958670ef6924f5fb6f185486
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
index 3e698f7023c2..8d4253b18eaf 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=891cb56cfd4f6b50aefa5ef3aa6e6502
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
index f12f4d4bbb3b..1d1cd50752a4 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_server-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_server
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff199fa823b6c1b60a561d88e110793e
diff --git a/metadata/md5-cache/dev-ros/rosserial_server-9999 b/metadata/md5-cache/dev-ros/rosserial_server-9999
index 53f9552d8912..a83a4df37fbd 100644
--- a/metadata/md5-cache/dev-ros/rosserial_server-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_server-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the rosserial server side
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_server
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rosserial_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=42c0ca77ff1cc75fc0d8c81fda6b4c08
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
index 18ff8372df75..5824dde4d334 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_tivac
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e259fcc04e64425f349cdab0bdb8924a
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3
index c715a27100e7..527a3b610441 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_tivac
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e259fcc04e64425f349cdab0bdb8924a
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4
index 44e45ac979e1..fe414175578d 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_tivac
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e259fcc04e64425f349cdab0bdb8924a
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5
index 11cbacf1eec7..54886d21689c 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_tivac
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_tar
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e259fcc04e64425f349cdab0bdb8924a
diff --git a/metadata/md5-cache/dev-ros/rosserial_tivac-9999 b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
index 8c21ac703d57..c9761c8e6b6a 100644
--- a/metadata/md5-cache/dev-ros/rosserial_tivac-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_tivac-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Definitions for rosserial_client targets for TivaC Launchpad evaluation boards.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_tivac
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e259fcc04e64425f349cdab0bdb8924a
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1
index c8db93c3a058..05c6d7ae98da 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_windows
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=521258215207468e44488f5343cb3507
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2
index 01b4a64c6bf5..d9e4274c8d49 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_windows
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07af40eb265a9902083b088336f5e292
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3
index 8273f799d710..d4f1b0bd5284 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_windows
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07af40eb265a9902083b088336f5e292
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4
index 0dd2dca739b2..79559b87554f 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_windows
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07af40eb265a9902083b088336f5e292
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5
index ae8742008052..feae68bb4370 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_windows
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07af40eb265a9902083b088336f5e292
diff --git a/metadata/md5-cache/dev-ros/rosserial_windows-9999 b/metadata/md5-cache/dev-ros/rosserial_windows-9999
index 59cef4a3885e..c65abf967dc6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_windows-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_windows-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Libraries and examples for ROSserial usage on Windows Platforms
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_windows
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_client[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=521258215207468e44488f5343cb3507
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1
index 5dce39d962ac..480fb0bba9f6 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools to do point to multipoint communication between rosserial nodes connected to an xbee
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_xbee
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.1.tar.gz -> rosserial-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e62c12fbfe3614b5fda63c6994939d7
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
index 15151e0e675e..9fc298607b8e 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools to do point to multipoint communication between rosserial nodes connected to an xbee
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_xbee
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.2.tar.gz -> rosserial-0.7.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b910cc71582d79472a5198de7a4c28b9
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
index 53c29c440c7d..03ec8f70ebac 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools to do point to multipoint communication between rosserial nodes connected to an xbee
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_xbee
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.3.tar.gz -> rosserial-0.7.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b910cc71582d79472a5198de7a4c28b9
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4
index dc6c7a50592b..93443ffeab63 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools to do point to multipoint communication between rosserial nodes connected to an xbee
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_xbee
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.4.tar.gz -> rosserial-0.7.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b910cc71582d79472a5198de7a4c28b9
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5 b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5
index 57613f01416a..77893f14d9cb 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-0.7.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools to do point to multipoint communication between rosserial nodes connected to an xbee
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_xbee
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/rosserial/archive/0.7.5.tar.gz -> rosserial-0.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b910cc71582d79472a5198de7a4c28b9
diff --git a/metadata/md5-cache/dev-ros/rosserial_xbee-9999 b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
index eabb2e9748b9..c052743c9494 100644
--- a/metadata/md5-cache/dev-ros/rosserial_xbee-9999
+++ b/metadata/md5-cache/dev-ros/rosserial_xbee-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tools to do point to multipoint communication between rosserial nodes connected to an xbee
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosserial_xbee
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyserial[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosserial_python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e62c12fbfe3614b5fda63c6994939d7
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.11.14 b/metadata/md5-cache/dev-ros/rosservice-1.11.14
index 0380efe2e6ac..2cc9229524cd 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.11.14
+++ b/metadata/md5-cache/dev-ros/rosservice-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.11.15 b/metadata/md5-cache/dev-ros/rosservice-1.11.15
index 2b6199e697a1..b2b1d265c8b2 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.11.15
+++ b/metadata/md5-cache/dev-ros/rosservice-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.11.16 b/metadata/md5-cache/dev-ros/rosservice-1.11.16
index 2ee9e0998b01..e87f26593d5d 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.11.16
+++ b/metadata/md5-cache/dev-ros/rosservice-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.11.17 b/metadata/md5-cache/dev-ros/rosservice-1.11.17
index d30aae24837e..5218c8f437a0 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.11.17
+++ b/metadata/md5-cache/dev-ros/rosservice-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.12.0 b/metadata/md5-cache/dev-ros/rosservice-1.12.0
index 2f0604494206..3df1dbc6f77b 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.12.0
+++ b/metadata/md5-cache/dev-ros/rosservice-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.12.1 b/metadata/md5-cache/dev-ros/rosservice-1.12.1
index f882c7cef94e..fa871d2ab827 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.12.1
+++ b/metadata/md5-cache/dev-ros/rosservice-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.12.2 b/metadata/md5-cache/dev-ros/rosservice-1.12.2
index 7bc96b8a838d..299e14e962b9 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.12.2
+++ b/metadata/md5-cache/dev-ros/rosservice-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35989db0afb80347f202a56266f429a7
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.12.4 b/metadata/md5-cache/dev-ros/rosservice-1.12.4
index b015d33f13c5..638ee0dc3eee 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.12.4
+++ b/metadata/md5-cache/dev-ros/rosservice-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35989db0afb80347f202a56266f429a7
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.12.5 b/metadata/md5-cache/dev-ros/rosservice-1.12.5
index f0d8baef1868..f41919edaf74 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosservice-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35989db0afb80347f202a56266f429a7
diff --git a/metadata/md5-cache/dev-ros/rosservice-1.12.6 b/metadata/md5-cache/dev-ros/rosservice-1.12.6
index b9388b991f33..5115470cc89b 100644
--- a/metadata/md5-cache/dev-ros/rosservice-1.12.6
+++ b/metadata/md5-cache/dev-ros/rosservice-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35989db0afb80347f202a56266f429a7
diff --git a/metadata/md5-cache/dev-ros/rosservice-9999 b/metadata/md5-cache/dev-ros/rosservice-9999
index c11690545c1f..d7ef3d5588e7 100644
--- a/metadata/md5-cache/dev-ros/rosservice-9999
+++ b/metadata/md5-cache/dev-ros/rosservice-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for listing and querying ROS Services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosservice
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2d6c4cbd33adb1075fae1c47c835045
diff --git a/metadata/md5-cache/dev-ros/rostest-1.11.14 b/metadata/md5-cache/dev-ros/rostest-1.11.14
index eb170e4dc7c8..baeddcaae932 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.11.14
+++ b/metadata/md5-cache/dev-ros/rostest-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostest-1.11.15 b/metadata/md5-cache/dev-ros/rostest-1.11.15
index 8972f2069d7d..46d66a4031e2 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.11.15
+++ b/metadata/md5-cache/dev-ros/rostest-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostest-1.11.16 b/metadata/md5-cache/dev-ros/rostest-1.11.16
index 9479a886d80c..54f091f69dea 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.11.16
+++ b/metadata/md5-cache/dev-ros/rostest-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostest-1.11.17 b/metadata/md5-cache/dev-ros/rostest-1.11.17
index 6e4496cea959..1df808f359f8 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.11.17
+++ b/metadata/md5-cache/dev-ros/rostest-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostest-1.12.0 b/metadata/md5-cache/dev-ros/rostest-1.12.0
index 33d6319f9f70..c96205954941 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.12.0
+++ b/metadata/md5-cache/dev-ros/rostest-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostest-1.12.1 b/metadata/md5-cache/dev-ros/rostest-1.12.1
index 61fe45facc19..6035cbac9c6c 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.12.1
+++ b/metadata/md5-cache/dev-ros/rostest-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostest-1.12.2 b/metadata/md5-cache/dev-ros/rostest-1.12.2
index 3d27a3abb20c..49e576342eef 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.12.2
+++ b/metadata/md5-cache/dev-ros/rostest-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f39c6e5b62a2f4e6b8b7166f8cdfa9
diff --git a/metadata/md5-cache/dev-ros/rostest-1.12.4 b/metadata/md5-cache/dev-ros/rostest-1.12.4
index 3ec651f5d4bf..7efb10731534 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.12.4
+++ b/metadata/md5-cache/dev-ros/rostest-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f39c6e5b62a2f4e6b8b7166f8cdfa9
diff --git a/metadata/md5-cache/dev-ros/rostest-1.12.5 b/metadata/md5-cache/dev-ros/rostest-1.12.5
index 537e629455cf..7c3e1b7dd27a 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.12.5
+++ b/metadata/md5-cache/dev-ros/rostest-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f39c6e5b62a2f4e6b8b7166f8cdfa9
diff --git a/metadata/md5-cache/dev-ros/rostest-1.12.6 b/metadata/md5-cache/dev-ros/rostest-1.12.6
index 3293529127a0..bd742a750dce 100644
--- a/metadata/md5-cache/dev-ros/rostest-1.12.6
+++ b/metadata/md5-cache/dev-ros/rostest-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2f39c6e5b62a2f4e6b8b7166f8cdfa9
diff --git a/metadata/md5-cache/dev-ros/rostest-9999 b/metadata/md5-cache/dev-ros/rostest-9999
index 7cd5af74cc88..4114bfd07b9e 100644
--- a/metadata/md5-cache/dev-ros/rostest-9999
+++ b/metadata/md5-cache/dev-ros/rostest-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] test? ( dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Integration test suite based on roslaunch that is compatible with xUnit frameworks
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostest
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bfec4e14e9bbd05a732cea0b3abf6adc
diff --git a/metadata/md5-cache/dev-ros/rostime-0.5.6 b/metadata/md5-cache/dev-ros/rostime-0.5.6
index cbedfbe1166b..b5f56e548271 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.5.6
+++ b/metadata/md5-cache/dev-ros/rostime-0.5.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostime
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common dev-util/catkin dev-python/
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.6.tar.gz -> roscpp_core-0.5.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=967682152fd9d8c9a1a844ac4566a972
diff --git a/metadata/md5-cache/dev-ros/rostime-0.5.7 b/metadata/md5-cache/dev-ros/rostime-0.5.7
index 402d592e6376..5f4732eae418 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.5.7
+++ b/metadata/md5-cache/dev-ros/rostime-0.5.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostime
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common dev-util/catkin dev-python/
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.5.7.tar.gz -> roscpp_core-0.5.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=967682152fd9d8c9a1a844ac4566a972
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.0 b/metadata/md5-cache/dev-ros/rostime-0.6.0
index 28a3f406e1ef..8f06b6fc3656 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.0
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostime
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common dev-util/catkin dev-python/
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.0.tar.gz -> roscpp_core-0.6.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=967682152fd9d8c9a1a844ac4566a972
diff --git a/metadata/md5-cache/dev-ros/rostime-0.6.1 b/metadata/md5-cache/dev-ros/rostime-0.6.1
index 13706ad622bd..8e2a788f74b1 100644
--- a/metadata/md5-cache/dev-ros/rostime-0.6.1
+++ b/metadata/md5-cache/dev-ros/rostime-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostime
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common dev-util/catkin dev-python/
 SLOT=0
 SRC_URI=https://github.com/ros/roscpp_core/archive/0.6.1.tar.gz -> roscpp_core-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8fa67f124b2cdec87e490b1dc8c3d8c
diff --git a/metadata/md5-cache/dev-ros/rostime-9999 b/metadata/md5-cache/dev-ros/rostime-9999
index 9ea817757653..b3320f5f07eb 100644
--- a/metadata/md5-cache/dev-ros/rostime-9999
+++ b/metadata/md5-cache/dev-ros/rostime-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Time and Duration implementations for C++ libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostime
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=967682152fd9d8c9a1a844ac4566a972
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.11.14 b/metadata/md5-cache/dev-ros/rostopic-1.11.14
index 82ddb874f583..d553a6ecab59 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.11.14
+++ b/metadata/md5-cache/dev-ros/rostopic-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.11.15 b/metadata/md5-cache/dev-ros/rostopic-1.11.15
index 16a14904b261..8f45d9d53003 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.11.15
+++ b/metadata/md5-cache/dev-ros/rostopic-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.11.16 b/metadata/md5-cache/dev-ros/rostopic-1.11.16
index ff6c40cde338..2c17578139b6 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.11.16
+++ b/metadata/md5-cache/dev-ros/rostopic-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.11.17 b/metadata/md5-cache/dev-ros/rostopic-1.11.17
index f27c759bc2d0..804749f89b42 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.11.17
+++ b/metadata/md5-cache/dev-ros/rostopic-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.12.0 b/metadata/md5-cache/dev-ros/rostopic-1.12.0
index 8707b35f22aa..d61e6bc28988 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.12.0
+++ b/metadata/md5-cache/dev-ros/rostopic-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.12.1 b/metadata/md5-cache/dev-ros/rostopic-1.12.1
index ee024fdb9e97..2bd1464d2cea 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.12.1
+++ b/metadata/md5-cache/dev-ros/rostopic-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.12.2 b/metadata/md5-cache/dev-ros/rostopic-1.12.2
index 8f4dd926fb88..4d62bab38c8f 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.12.2
+++ b/metadata/md5-cache/dev-ros/rostopic-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2bed613ca0c32ad1147dde1d7d32b46
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.12.4 b/metadata/md5-cache/dev-ros/rostopic-1.12.4
index 9a0aafd3d042..736788873ec1 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.12.4
+++ b/metadata/md5-cache/dev-ros/rostopic-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2bed613ca0c32ad1147dde1d7d32b46
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.12.5 b/metadata/md5-cache/dev-ros/rostopic-1.12.5
index 2892b2770772..07ce352b3e2f 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.12.5
+++ b/metadata/md5-cache/dev-ros/rostopic-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2bed613ca0c32ad1147dde1d7d32b46
diff --git a/metadata/md5-cache/dev-ros/rostopic-1.12.6 b/metadata/md5-cache/dev-ros/rostopic-1.12.6
index 956c20a743bc..0e8440c2eb28 100644
--- a/metadata/md5-cache/dev-ros/rostopic-1.12.6
+++ b/metadata/md5-cache/dev-ros/rostopic-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d2bed613ca0c32ad1147dde1d7d32b46
diff --git a/metadata/md5-cache/dev-ros/rostopic-9999 b/metadata/md5-cache/dev-ros/rostopic-9999
index 3164e4cbee99..9c18cb896eaa 100644
--- a/metadata/md5-cache/dev-ros/rostopic-9999
+++ b/metadata/md5-cache/dev-ros/rostopic-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Command-line tool for displaying debug information about ROS Topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rostopic
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dd431e106fc3a40c882a89e1f5ed7f17
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.12.3 b/metadata/md5-cache/dev-ros/rosunit-1.12.3
index c1b9ee61db23..9edf27ecd770 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.12.3
+++ b/metadata/md5-cache/dev-ros/rosunit-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.3.tar.gz -> ros-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc8196023f2796e3ce28d390deb4cc2f
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.12.5 b/metadata/md5-cache/dev-ros/rosunit-1.12.5
index c1e05f233a18..ae378ae2bcaa 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.12.5
+++ b/metadata/md5-cache/dev-ros/rosunit-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.12.5.tar.gz -> ros-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc8196023f2796e3ce28d390deb4cc2f
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.13.1 b/metadata/md5-cache/dev-ros/rosunit-1.13.1
index 402cdcf13ebd..b92477eddc1e 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.13.1
+++ b/metadata/md5-cache/dev-ros/rosunit-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.1.tar.gz -> ros-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc8196023f2796e3ce28d390deb4cc2f
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.13.2 b/metadata/md5-cache/dev-ros/rosunit-1.13.2
index 07d79420d688..5ac5f8c276b9 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.13.2
+++ b/metadata/md5-cache/dev-ros/rosunit-1.13.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.2.tar.gz -> ros-1.13.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=376de523caa4136e7347ae591057642f
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.13.3 b/metadata/md5-cache/dev-ros/rosunit-1.13.3
index c99c89e6571f..c99b04961ea7 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.13.3
+++ b/metadata/md5-cache/dev-ros/rosunit-1.13.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.3.tar.gz -> ros-1.13.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=376de523caa4136e7347ae591057642f
diff --git a/metadata/md5-cache/dev-ros/rosunit-1.13.4 b/metadata/md5-cache/dev-ros/rosunit-1.13.4
index 19d6a667d289..336f3b8eca6b 100644
--- a/metadata/md5-cache/dev-ros/rosunit-1.13.4
+++ b/metadata/md5-cache/dev-ros/rosunit-1.13.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(
 SLOT=0
 SRC_URI=https://github.com/ros/ros/archive/1.13.4.tar.gz -> ros-1.13.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=376de523caa4136e7347ae591057642f
diff --git a/metadata/md5-cache/dev-ros/rosunit-9999 b/metadata/md5-cache/dev-ros/rosunit-9999
index a1fe9684be1e..4636d11fc8e2 100644
--- a/metadata/md5-cache/dev-ros/rosunit-9999
+++ b/metadata/md5-cache/dev-ros/rosunit-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Unit-testing package for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosunit
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/roslib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fc8196023f2796e3ce28d390deb4cc2f
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.11.14 b/metadata/md5-cache/dev-ros/roswtf-1.11.14
index 1c153f9c4c59..b0504fa6045d 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.11.14
+++ b/metadata/md5-cache/dev-ros/roswtf-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73c415d840164f8ce76d4873f9505bc2
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.11.15 b/metadata/md5-cache/dev-ros/roswtf-1.11.15
index 82d8c9985347..258987178b06 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.11.15
+++ b/metadata/md5-cache/dev-ros/roswtf-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73c415d840164f8ce76d4873f9505bc2
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.11.16 b/metadata/md5-cache/dev-ros/roswtf-1.11.16
index 3c9cccba65b2..195ccdf88e42 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.11.16
+++ b/metadata/md5-cache/dev-ros/roswtf-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73c415d840164f8ce76d4873f9505bc2
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.11.17 b/metadata/md5-cache/dev-ros/roswtf-1.11.17
index f548bfdff7b9..f91a8f4f2464 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.11.17
+++ b/metadata/md5-cache/dev-ros/roswtf-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73c415d840164f8ce76d4873f9505bc2
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.12.0 b/metadata/md5-cache/dev-ros/roswtf-1.12.0
index 06ab343e0bd2..328b0f00e95b 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.12.0
+++ b/metadata/md5-cache/dev-ros/roswtf-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:- src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=73c415d840164f8ce76d4873f9505bc2
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.12.1 b/metadata/md5-cache/dev-ros/roswtf-1.12.1
index 75beab0fe7a0..0254f1ad1f2e 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.12.1
+++ b/metadata/md5-cache/dev-ros/roswtf-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40f6d49c90f259587fb1bc0331c7e5ed
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.12.2 b/metadata/md5-cache/dev-ros/roswtf-1.12.2
index 8218da75595e..08a5775c7edf 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.12.2
+++ b/metadata/md5-cache/dev-ros/roswtf-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2225ce0bca8efa7f263f336f8396c9d5
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.12.4 b/metadata/md5-cache/dev-ros/roswtf-1.12.4
index 6980ee52376f..ab0a1981cfc7 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.12.4
+++ b/metadata/md5-cache/dev-ros/roswtf-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2225ce0bca8efa7f263f336f8396c9d5
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.12.5 b/metadata/md5-cache/dev-ros/roswtf-1.12.5
index b99bf9c0578d..a0c3d96aa31b 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.12.5
+++ b/metadata/md5-cache/dev-ros/roswtf-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2225ce0bca8efa7f263f336f8396c9d5
diff --git a/metadata/md5-cache/dev-ros/roswtf-1.12.6 b/metadata/md5-cache/dev-ros/roswtf-1.12.6
index d92919be739d..413e062a8c4a 100644
--- a/metadata/md5-cache/dev-ros/roswtf-1.12.6
+++ b/metadata/md5-cache/dev-ros/roswtf-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -10,5 +10,5 @@ RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_p
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2225ce0bca8efa7f263f336f8396c9d5
diff --git a/metadata/md5-cache/dev-ros/roswtf-9999 b/metadata/md5-cache/dev-ros/roswtf-9999
index a0550575cc7c..cd24e756d363 100644
--- a/metadata/md5-cache/dev-ros/roswtf-9999
+++ b/metadata/md5-cache/dev-ros/roswtf-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosdep[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/rosinstall[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tool for diagnosing issues with a running ROS system
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/roswtf
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40f6d49c90f259587fb1bc0331c7e5ed
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.13.0 b/metadata/md5-cache/dev-ros/rotate_recovery-1.13.0
index caad8e4815b2..537c6a6c51a6 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.13.0
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rotate_recovery
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pl
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c9716f7c283db92e10805ce45d33a21
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.13.1 b/metadata/md5-cache/dev-ros/rotate_recovery-1.13.1
index 19d23cb033af..fdaa6397642f 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.13.1
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rotate_recovery
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pl
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c9716f7c283db92e10805ce45d33a21
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-1.14.0 b/metadata/md5-cache/dev-ros/rotate_recovery-1.14.0
index d9082a43da69..30a97b9aede8 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-1.14.0
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rotate_recovery
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pl
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=642e49278a7a30d326de0d89df32b91a
diff --git a/metadata/md5-cache/dev-ros/rotate_recovery-9999 b/metadata/md5-cache/dev-ros/rotate_recovery-9999
index dc81d419c9a6..548500dc295b 100644
--- a/metadata/md5-cache/dev-ros/rotate_recovery-9999
+++ b/metadata/md5-cache/dev-ros/rotate_recovery-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by performing a 360 degree rotation of the robot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rotate_recovery
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/base_local_planner dev-cpp/eigen:3 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3c9716f7c283db92e10805ce45d33a21
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.3.12 b/metadata/md5-cache/dev-ros/rqt_action-0.3.12
index 9798e1485712..85a4e3177311 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06e18ebbd9467025904ba5a0cd7a9649
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.3.13 b/metadata/md5-cache/dev-ros/rqt_action-0.3.13
index 7ca72fb5d4ca..f8672449761a 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06e18ebbd9467025904ba5a0cd7a9649
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.0 b/metadata/md5-cache/dev-ros/rqt_action-0.4.0
index a331132e5d45..50bd3ba9f297 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06e18ebbd9467025904ba5a0cd7a9649
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.1 b/metadata/md5-cache/dev-ros/rqt_action-0.4.1
index dd4c6355afb9..5ada1e1ad91e 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc8eef33b2b3633391230f938d3464ca
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.2 b/metadata/md5-cache/dev-ros/rqt_action-0.4.2
index 051dfd90220e..1bc6ebdaa9ed 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc8eef33b2b3633391230f938d3464ca
diff --git a/metadata/md5-cache/dev-ros/rqt_action-0.4.3 b/metadata/md5-cache/dev-ros/rqt_action-0.4.3
index ad68ded00d16..94df2b923a70 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_action-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=dc8eef33b2b3633391230f938d3464ca
diff --git a/metadata/md5-cache/dev-ros/rqt_action-9999 b/metadata/md5-cache/dev-ros/rqt_action-9999
index 50ed4ba39dc9..c4adef1c8fd4 100644
--- a/metadata/md5-cache/dev-ros/rqt_action-9999
+++ b/metadata/md5-cache/dev-ros/rqt_action-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Introspect all available ROS action (from actionlib) types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_action
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06e18ebbd9467025904ba5a0cd7a9649
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.3.12 b/metadata/md5-cache/dev-ros/rqt_bag-0.3.12
index 3578f0de973d..521c2b5375dd 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cd1a9616cf5bfa6ca9d4d6d050c2b18
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.3.13 b/metadata/md5-cache/dev-ros/rqt_bag-0.3.13
index e43fbde4079b..6115629ce7fc 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cd1a9616cf5bfa6ca9d4d6d050c2b18
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.0 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.0
index 554835f4062f..b43214086883 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cd1a9616cf5bfa6ca9d4d6d050c2b18
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.1 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.1
index 79fc4484cecb..d2881de28165 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98761029bac406087ccdcfbf62effc0b
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.2 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.2
index 425f30cd9c76..a60356b2369d 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98761029bac406087ccdcfbf62effc0b
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-0.4.3 b/metadata/md5-cache/dev-ros/rqt_bag-0.4.3
index 4e157e7d31ca..a93caa55fae5 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_bag-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=98761029bac406087ccdcfbf62effc0b
diff --git a/metadata/md5-cache/dev-ros/rqt_bag-9999 b/metadata/md5-cache/dev-ros/rqt_bag-9999
index 1f2a0cd7d63d..fa9841d46b51 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5cd1a9616cf5bfa6ca9d4d6d050c2b18
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.12 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.12
index ef996aeb582d..9e447f8f1de8 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2845314465e0a43db7d1055be4c7bfe
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.13 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.13
index 2f4a13681a18..69628eb6be06 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2845314465e0a43db7d1055be4c7bfe
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.0 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.0
index 19e400fc27c8..8bc9eb76788b 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2845314465e0a43db7d1055be4c7bfe
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.1 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.1
index 800e0739cefd..0453af6c6512 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de84f8afd9436b96886d80f49420ea8
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.2 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.2
index d4a1ace884d3..c71f5e6b3629 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de84f8afd9436b96886d80f49420ea8
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.3 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.3
index 5b68915258d5..8dbb4b18d384 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7de84f8afd9436b96886d80f49420ea8
diff --git a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999 b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
index 163819f01d1b..4ab46647ff60 100644
--- a/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
+++ b/metadata/md5-cache/dev-ros/rqt_bag_plugins-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and replaying ROS bag files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_bag_plugins
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c2845314465e0a43db7d1055be4c7bfe
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.3.12 b/metadata/md5-cache/dev-ros/rqt_console-0.3.12
index c1928fa32744..130f3e534356 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3126c44fc7ad9b042d476406b3e7067
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.3.13 b/metadata/md5-cache/dev-ros/rqt_console-0.3.13
index 5a386fdf47b1..5bc700f6d441 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a3126c44fc7ad9b042d476406b3e7067
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.0 b/metadata/md5-cache/dev-ros/rqt_console-0.4.0
index 50435feab829..83aa56de7679 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=44e25c20d23bef7785c225f4709a83bd
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.1 b/metadata/md5-cache/dev-ros/rqt_console-0.4.1
index 8b5adfa6aa92..5183f1b4e07e 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55060be709dfaf73d65e7c3bf633e284
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.2 b/metadata/md5-cache/dev-ros/rqt_console-0.4.2
index b54e68a668c1..7313f1a71594 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55060be709dfaf73d65e7c3bf633e284
diff --git a/metadata/md5-cache/dev-ros/rqt_console-0.4.3 b/metadata/md5-cache/dev-ros/rqt_console-0.4.3
index e61d327530e3..d3c452271eea 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_console-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=55060be709dfaf73d65e7c3bf633e284
diff --git a/metadata/md5-cache/dev-ros/rqt_console-9999 b/metadata/md5-cache/dev-ros/rqt_console-9999
index 7434dbffc73f..1e57a2e9ac3b 100644
--- a/metadata/md5-cache/dev-ros/rqt_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_console-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying and filtering ROS messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_console
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_logger_level[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=44e25c20d23bef7785c225f4709a83bd
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.0 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.0
index 73cb2b51d2e7..cdd4dedaa0a8 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.0
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f8a79d2735c004b92ecbf83b94cffac
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.1
index 32597c21e489..f84da6c263eb 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.1
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f8a79d2735c004b92ecbf83b94cffac
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.0 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.0
index 9a1d4e002941..1fd3f634bbf7 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.0
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1643139017b65ffce6e52f2e40d35c03
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.1 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.1
index f7068379f426..975c03bf65c2 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.1
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1643139017b65ffce6e52f2e40d35c03
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.2 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.2
index d14aee73f54d..fb1dbbd6b56d 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.2
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1643139017b65ffce6e52f2e40d35c03
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.3 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.3
index fd16ec02febf..dff44355db90 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.3
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1643139017b65ffce6e52f2e40d35c03
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.9.3 b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.9.3
index cf807058832b..88fa52cb75c8 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-0.9.3
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f8a79d2735c004b92ecbf83b94cffac
diff --git a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999 b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
index 0cb3f95a380a..5d276f4b1d95 100644
--- a/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
+++ b/metadata/md5-cache/dev-ros/rqt_controller_manager-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT control manager plugin
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_controller_manager
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/controller_manager[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7f8a79d2735c004b92ecbf83b94cffac
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.3.12 b/metadata/md5-cache/dev-ros/rqt_dep-0.3.12
index f31815c68fc9..46e9d692e0e4 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d3eb49bb277ed6b9ff3c75458ab499a
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.3.13 b/metadata/md5-cache/dev-ros/rqt_dep-0.3.13
index 312ca24a74f1..2d85f0fa1ffc 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d3eb49bb277ed6b9ff3c75458ab499a
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.0 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.0
index f516812f4cd6..c4c212c672e7 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d3eb49bb277ed6b9ff3c75458ab499a
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.1 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.1
index 298f76f7985d..d10c5c2bb4ad 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40d81a672567e938688080a0b298ca3c
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.2 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.2
index b4a90873a07a..df19dcdd589c 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40d81a672567e938688080a0b298ca3c
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-0.4.3 b/metadata/md5-cache/dev-ros/rqt_dep-0.4.3
index a7173b20d113..7cd62da47c94 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_dep-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=40d81a672567e938688080a0b298ca3c
diff --git a/metadata/md5-cache/dev-ros/rqt_dep-9999 b/metadata/md5-cache/dev-ros/rqt_dep-9999
index 6fee88ffb6d0..a383f26febfa 100644
--- a/metadata/md5-cache/dev-ros/rqt_dep-9999
+++ b/metadata/md5-cache/dev-ros/rqt_dep-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS dependency graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_dep
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d3eb49bb277ed6b9ff3c75458ab499a
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.3.12 b/metadata/md5-cache/dev-ros/rqt_graph-0.3.12
index 09d3d64eff99..2b6547cf94a2 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1ad3e39a14e3b1df85706b12b64f6dc
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.3.13 b/metadata/md5-cache/dev-ros/rqt_graph-0.3.13
index 3197c7d294c9..b4fe19d5ea95 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1ad3e39a14e3b1df85706b12b64f6dc
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.0 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.0
index 66f0653ab427..34c075b21828 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1ad3e39a14e3b1df85706b12b64f6dc
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.1 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.1
index 13760f54c27b..ffb4ece363ae 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13bd2d3b078e46b26d9971826dcab57
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.2 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.2
index 0228b4b259be..31ab488856f2 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13bd2d3b078e46b26d9971826dcab57
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-0.4.3 b/metadata/md5-cache/dev-ros/rqt_graph-0.4.3
index abfb1cd0605f..834864ed9894 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_graph-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a13bd2d3b078e46b26d9971826dcab57
diff --git a/metadata/md5-cache/dev-ros/rqt_graph-9999 b/metadata/md5-cache/dev-ros/rqt_graph-9999
index 8b7bf320a55f..b77765a09da9 100644
--- a/metadata/md5-cache/dev-ros/rqt_graph-9999
+++ b/metadata/md5-cache/dev-ros/rqt_graph-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS computation graph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_graph
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d1ad3e39a14e3b1df85706b12b64f6dc
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.2.14 b/metadata/md5-cache/dev-ros/rqt_gui-0.2.14
index aa95635b5ea9..4607c1fc032b 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.2.14
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.2.14.tar.gz -> rqt-0.2.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17dbd7cf7afed3536c408d3cbd6e2340
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-0.3.1 b/metadata/md5-cache/dev-ros/rqt_gui-0.3.1
index 0f04785e88b4..62302971d223 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-0.3.1
+++ b/metadata/md5-cache/dev-ros/rqt_gui-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui
@@ -10,5 +10,5 @@ RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_targe
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.1.tar.gz -> rqt-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74c1611e0495e82d01b64c83bef138cc
diff --git a/metadata/md5-cache/dev-ros/rqt_gui-9999 b/metadata/md5-cache/dev-ros/rqt_gui-9999
index de2af1d4e2d1..68c675161ae7 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Main to start an instance of the ROS integrated graphical user interface provided by qt_gui
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=>=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74c1611e0495e82d01b64c83bef138cc
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.2.14 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.2.14
index be74eb1ae6e6..00d2576fd612 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.2.14
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 dev-ros/qt_gui_cpp dev-ros/qt_gui dev-ros/roscpp dev-ros/nodelet sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 dev-ros/qt_gui_cpp dev-ros/qt_gui dev-ros/roscpp dev-ros/nodelet sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui_cpp
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:4 dev-qt/qtcore:4 dev-ros/qt_gui_cpp dev-ros/qt_gui dev-ros
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.2.14.tar.gz -> rqt-0.2.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f95eb19dae4b5a81e29d93336599012
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.3.1 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.3.1
index 3889c377c752..bd036f26e76f 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.3.1
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-0.3.1
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui_cpp
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtcore:5 >=dev-ros/qt_gui_cpp-0.3.0 >=dev-ros/
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.1.tar.gz -> rqt-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9b1c8853f58780e04fd87c5698ca067
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999 b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
index f655661807b5..90057558fa03 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -1,5 +1,5 @@
 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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Enables GUI plugins to use the C++ client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui_cpp
@@ -8,5 +8,5 @@ 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-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d9b1c8853f58780e04fd87c5698ca067
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.2.14 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.2.14
index e39f1efa9509..e45baf047d10 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.2.14
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.2.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.2.14.tar.gz -> rqt-0.2.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e554aea155bebd40e7ad6976286f165
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.1 b/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.1
index 67e0cf09b71a..becccb74b60c 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.1
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt/archive/0.3.1.tar.gz -> rqt-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04590e2b4d035c1b0cba0e251d52758b
diff --git a/metadata/md5-cache/dev-ros/rqt_gui_py-9999 b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
index 006e5ae3ce98..93f6dc68e204 100644
--- a/metadata/md5-cache/dev-ros/rqt_gui_py-9999
+++ b/metadata/md5-cache/dev-ros/rqt_gui_py-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Enables GUI plugins to use the Python client library for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_gui_py
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/qt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui-0.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=04590e2b4d035c1b0cba0e251d52758b
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.3.12 b/metadata/md5-cache/dev-ros/rqt_image_view-0.3.12
index 3302766c507a..654da4b8360d 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee9403a42a2c57205c2e297b1e36844
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.3.13 b/metadata/md5-cache/dev-ros/rqt_image_view-0.3.13
index d3070b80968a..434005d78874 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fee9403a42a2c57205c2e297b1e36844
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.0 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.0
index 7b0041add307..ffb3269d47bc 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d52f9de36be9ade2f138d4b5539ef0c2
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.1 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.1
index 247ab9b83a4a..fee5f321c86e 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d2bd6e9eaf5cd3ffacb162932232448
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.2 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.2
index 9d6fe020610f..c5433605756f 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d2bd6e9eaf5cd3ffacb162932232448
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.3 b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.3
index dd2af9ee5481..812a839c3461 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7d2bd6e9eaf5cd3ffacb162932232448
diff --git a/metadata/md5-cache/dev-ros/rqt_image_view-9999 b/metadata/md5-cache/dev-ros/rqt_image_view-9999
index a6b776a8c9c9..34b3a3de6b1d 100644
--- a/metadata/md5-cache/dev-ros/rqt_image_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_image_view-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying images using image_transport
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_image_view
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/rqt_gui_cpp-0.3 dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-qt/qtwidgets:5 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d52f9de36be9ade2f138d4b5539ef0c2
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.3.12 b/metadata/md5-cache/dev-ros/rqt_launch-0.3.12
index 63bbbed74d92..fa636b9f6f2d 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fb1179cfc082ea901f6a67a0455b9f1
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.3.13 b/metadata/md5-cache/dev-ros/rqt_launch-0.3.13
index e45ff283eac1..0963a8b5c596 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fb1179cfc082ea901f6a67a0455b9f1
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.0 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.0
index 4fc82d2a033e..2a42d92e277f 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fb1179cfc082ea901f6a67a0455b9f1
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.1 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.1
index c5f828af3377..394b50107bf6 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e48757d77b075bbb63894bfcf334f64
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.2 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.2
index fa30edb156e1..a488219dbd8d 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e48757d77b075bbb63894bfcf334f64
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-0.4.3 b/metadata/md5-cache/dev-ros/rqt_launch-0.4.3
index 455dd42ab1b1..1b2a05a44cc1 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_launch-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6e48757d77b075bbb63894bfcf334f64
diff --git a/metadata/md5-cache/dev-ros/rqt_launch-9999 b/metadata/md5-cache/dev-ros/rqt_launch-9999
index 64cce38dce59..9ae60f2382c7 100644
--- a/metadata/md5-cache/dev-ros/rqt_launch-9999
+++ b/metadata/md5-cache/dev-ros/rqt_launch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Easy view of .launch files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_launch
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1fb1179cfc082ea901f6a67a0455b9f1
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.12 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.12
index 924c23b92415..5596fafb05bd 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38f763bfde0cfa83ba41c9fddd7d8d67
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.13 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.13
index a137d9c9657c..6a7c611dca61 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38f763bfde0cfa83ba41c9fddd7d8d67
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.0 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.0
index 3e57acd1a97d..0eb8381b2389 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38f763bfde0cfa83ba41c9fddd7d8d67
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.1 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.1
index 0758b42f6e40..d02173d52b11 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5628b46a459927916edecc604af9e9d
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.2 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.2
index ed971133ebb0..ef9e8e1393c6 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5628b46a459927916edecc604af9e9d
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.3 b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.3
index a96343eb2439..122339d67dbc 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b5628b46a459927916edecc604af9e9d
diff --git a/metadata/md5-cache/dev-ros/rqt_logger_level-9999 b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
index fcfcc84b89ee..7f5c358aabed 100644
--- a/metadata/md5-cache/dev-ros/rqt_logger_level-9999
+++ b/metadata/md5-cache/dev-ros/rqt_logger_level-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for configuring the logger level of ROS nodes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_logger_level
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=38f763bfde0cfa83ba41c9fddd7d8d67
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.4.2 b/metadata/md5-cache/dev-ros/rqt_moveit-0.4.2
index 479966375d79..9e2a35932728 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ceeea4aa2f58e2b46b6b5c12885e95b7
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.4.3 b/metadata/md5-cache/dev-ros/rqt_moveit-0.4.3
index fad61faed3da..2a93b8c245b5 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ceeea4aa2f58e2b46b6b5c12885e95b7
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.2 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.2
index fc4c0f10e46a..ba06a03f8c62 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ceeea4aa2f58e2b46b6b5c12885e95b7
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.3 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.3
index 599ffd4851a0..97a5dad07b42 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f23bbec37314f68e59213638c41148a
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.4 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.4
index a8d574b231f7..6687b12ae67d 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f23bbec37314f68e59213638c41148a
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.5 b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.5
index c4b9c98669f9..42427ca25bb1 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6f23bbec37314f68e59213638c41148a
diff --git a/metadata/md5-cache/dev-ros/rqt_moveit-9999 b/metadata/md5-cache/dev-ros/rqt_moveit-9999
index 5d781e34ca45..ca55e6c4009e 100644
--- a/metadata/md5-cache/dev-ros/rqt_moveit-9999
+++ b/metadata/md5-cache/dev-ros/rqt_moveit-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Assists monitoring tasks for MoveIt! motion planner
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_moveit
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosnode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_topic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ceeea4aa2f58e2b46b6b5c12885e95b7
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.3.12 b/metadata/md5-cache/dev-ros/rqt_msg-0.3.12
index d780bb69281c..0e75dc269165 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06adfd1bbc329a8c8247c1d17f6ab712
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.3.13 b/metadata/md5-cache/dev-ros/rqt_msg-0.3.13
index 56594f23866b..6e2049e6c409 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=06adfd1bbc329a8c8247c1d17f6ab712
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.0 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.0
index 9b1da0814c42..cb10e6f56fa7 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee4e87217dca40acf353c9a2a186c7a7
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.1 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.1
index 2ddd037969e1..8e54c6ef62d9 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50e75b6df1ac04b93e970a0859669d82
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.2 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.2
index a1621ea7fa45..e330d0066996 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50e75b6df1ac04b93e970a0859669d82
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-0.4.3 b/metadata/md5-cache/dev-ros/rqt_msg-0.4.3
index aa89d406293b..260f11223188 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_msg-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=50e75b6df1ac04b93e970a0859669d82
diff --git a/metadata/md5-cache/dev-ros/rqt_msg-9999 b/metadata/md5-cache/dev-ros/rqt_msg-9999
index 338a257a2ae5..6d5dc6810dcd 100644
--- a/metadata/md5-cache/dev-ros/rqt_msg-9999
+++ b/metadata/md5-cache/dev-ros/rqt_msg-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_msg
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee4e87217dca40acf353c9a2a186c7a7
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.2 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.2
index e2688b3d4b0c..eb71aab85b72 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89f68ff9fd6bc04a5d9c9088e13a3a84
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.3 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.3
index e16094fc96ed..b8aeb0fc0463 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89f68ff9fd6bc04a5d9c9088e13a3a84
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.2 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.2
index d5cd0b909b92..fb2e9a602ebb 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89f68ff9fd6bc04a5d9c9088e13a3a84
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.3 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.3
index 88b1663d6bd5..ff59725b8ad3 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0de27c26068a7c8cfe6edf0182aa429f
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.4 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.4
index b2040080680a..e40090368cbb 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0de27c26068a7c8cfe6edf0182aa429f
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.5 b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.5
index c20da498b22d..f36ab7fb8b85 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0de27c26068a7c8cfe6edf0182aa429f
diff --git a/metadata/md5-cache/dev-ros/rqt_nav_view-9999 b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
index 6ab55288493b..b781ca3cfe19 100644
--- a/metadata/md5-cache/dev-ros/rqt_nav_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_nav_view-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides a gui for viewing navigation maps and paths
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_nav_view
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89f68ff9fd6bc04a5d9c9088e13a3a84
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.1 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.1
index 5d4aab87a0f2..b8311cafbf94 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_plot
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d01f7331e3d5d7573da897cb75a252fb
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.2 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.2
index ed10fe23bb0f..aa631ff1d4ac 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_plot
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29811743cb362d4ccdbe8d1825dc2990
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-0.4.3 b/metadata/md5-cache/dev-ros/rqt_plot-0.4.3
index a76c916c9509..28337cbc31aa 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_plot-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_plot
@@ -10,5 +10,5 @@ RDEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_t
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29811743cb362d4ccdbe8d1825dc2990
diff --git a/metadata/md5-cache/dev-ros/rqt_plot-9999 b/metadata/md5-cache/dev-ros/rqt_plot-9999
index f282b59ea7af..95a4e2674ba5 100644
--- a/metadata/md5-cache/dev-ros/rqt_plot-9999
+++ b/metadata/md5-cache/dev-ros/rqt_plot-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin visualizing numeric values in a 2D plot
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_plot
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyqwt:5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=29811743cb362d4ccdbe8d1825dc2990
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.2 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.2
index 49c5e6a4b44b..408b841330e7 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a971d148a235eab54235a66be9ceb6bc
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.3 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.3
index cfb1ad9fbd62..81cc7f7e4289 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a971d148a235eab54235a66be9ceb6bc
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.2 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.2
index b8fac8bdb3e1..1058d96eecf2 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a971d148a235eab54235a66be9ceb6bc
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.3 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.3
index 5dea5ff537dd..17cc4ed6f626 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b349a153d2d1bb7fa48a50b4babd4f7d
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.4 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.4
index 4b7651c19f4e..a5b0c7f0dfb3 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b349a153d2d1bb7fa48a50b4babd4f7d
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.5 b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.5
index 2d829c2fc86f..49100b11fe8c 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b349a153d2d1bb7fa48a50b4babd4f7d
diff --git a/metadata/md5-cache/dev-ros/rqt_pose_view-9999 b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
index 66e9febf9c77..b721af869d71 100644
--- a/metadata/md5-cache/dev-ros/rqt_pose_view-9999
+++ b/metadata/md5-cache/dev-ros/rqt_pose_view-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing 3D poses
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_pose_view
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt4[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a971d148a235eab54235a66be9ceb6bc
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.3.12 b/metadata/md5-cache/dev-ros/rqt_publisher-0.3.12
index e0331d0de512..5588f12fdb66 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11031e33fce9da2cb6cc2c317c7707f0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.3.13 b/metadata/md5-cache/dev-ros/rqt_publisher-0.3.13
index 765a74293b58..a0c56068918b 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=11031e33fce9da2cb6cc2c317c7707f0
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.0 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.0
index 055d9b79d23b..84e4f631955e 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec750b663d22e2bccccd56a9303f96d2
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.1 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.1
index f132d6d88ca6..b88019abd38d 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8099a33f5794229943844d42553dc496
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.2 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.2
index d6d463e1562b..36894e7b1a2d 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8099a33f5794229943844d42553dc496
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.3 b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.3
index 270eb6ed3497..1e7fd266f096 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8099a33f5794229943844d42553dc496
diff --git a/metadata/md5-cache/dev-ros/rqt_publisher-9999 b/metadata/md5-cache/dev-ros/rqt_publisher-9999
index f377ec5fa82a..1d05eccc8f29 100644
--- a/metadata/md5-cache/dev-ros/rqt_publisher-9999
+++ b/metadata/md5-cache/dev-ros/rqt_publisher-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for publishing arbitrary messages with fixed or computed field values
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_publisher
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ec750b663d22e2bccccd56a9303f96d2
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.3.12 b/metadata/md5-cache/dev-ros/rqt_py_common-0.3.12
index f22799c045f1..14381095685b 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb12245eafcf4a8cbe2c3b354915e074
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.3.13 b/metadata/md5-cache/dev-ros/rqt_py_common-0.3.13
index 2cb34210edc7..37e445cd9262 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fb12245eafcf4a8cbe2c3b354915e074
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.0 b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.0
index 91d241c55417..3fea01ef416c 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07d5956a3a9e45034adeaddbbb6b26c9
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.1 b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.1
index cb756b7c2a3c..f3a26f7042c8 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dffc374adce71d3c0df704e2983a6ad
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.2 b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.2
index d394c10fbb01..71142372a6bb 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dffc374adce71d3c0df704e2983a6ad
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.3 b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.3
index ffce1d2986b9..98556b5fbd4c 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8dffc374adce71d3c0df704e2983a6ad
diff --git a/metadata/md5-cache/dev-ros/rqt_py_common-9999 b/metadata/md5-cache/dev-ros/rqt_py_common-9999
index f58e388bfd88..bef2359b5b9c 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_common-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_common-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Common functionality for rqt plugins written in Python
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_common
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07d5956a3a9e45034adeaddbbb6b26c9
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.3.12 b/metadata/md5-cache/dev-ros/rqt_py_console-0.3.12
index 1e7ca804f3be..6340b6e20594 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=344f0b98e4a72f3a0605cb3c486386bb
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.3.13 b/metadata/md5-cache/dev-ros/rqt_py_console-0.3.13
index e3c3af86989d..b4755b1b27e2 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=344f0b98e4a72f3a0605cb3c486386bb
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.0 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.0
index 61c6728eba62..93ee985db65a 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=344f0b98e4a72f3a0605cb3c486386bb
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.1 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.1
index 541faec32606..4a96355fbc1e 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=083a26069d9bb210bf712fb9c3e2e596
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.2 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.2
index 40834ca752af..f2c1d3059414 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=083a26069d9bb210bf712fb9c3e2e596
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.3 b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.3
index 5a8f1e34cef5..7a92d6ae5118 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=083a26069d9bb210bf712fb9c3e2e596
diff --git a/metadata/md5-cache/dev-ros/rqt_py_console-9999 b/metadata/md5-cache/dev-ros/rqt_py_console-9999
index 3837fce32cd7..79e424b54c3e 100644
--- a/metadata/md5-cache/dev-ros/rqt_py_console-9999
+++ b/metadata/md5-cache/dev-ros/rqt_py_console-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Python GUI plugin providing an interactive Python console
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_py_console
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=344f0b98e4a72f3a0605cb3c486386bb
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.12 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.12
index 52b5e322eefe..e9c98d952707 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=094dd13f77943f7bd9f70c539f65c395
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.13 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.13
index 767f8f2e2a1b..b1372a7880d4 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=094dd13f77943f7bd9f70c539f65c395
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.0 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.0
index 79e09aac5788..3d894d60e2e2 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=094dd13f77943f7bd9f70c539f65c395
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.1 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.1
index f214b1f3de56..ac47063c3baf 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13b5e99f3102964a2dc0cb827fd1c48c
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.2 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.2
index 3bf0841cfe6b..3899d1027f3a 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13b5e99f3102964a2dc0cb827fd1c48c
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.3 b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.3
index 3443c6cf7924..94bc9e4b4347 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=13b5e99f3102964a2dc0cb827fd1c48c
diff --git a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999 b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
index 45a37f703c4b..013a8f3a1802 100644
--- a/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Provides the way to view and edit the parameters that are accessible via dynamic_reconfigure
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_reconfigure
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=094dd13f77943f7bd9f70c539f65c395
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.2 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.2
index ec8365b5cc0a..5fae057aeb44 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a8e575b3c463cad71cacb847158b782
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.3 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.3
index eb9c2bb5b96d..e64ecb64e86c 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a8e575b3c463cad71cacb847158b782
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.2 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.2
index 3093f8ec88c2..17b9ccc8b207 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a8e575b3c463cad71cacb847158b782
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.3 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.3
index 6e888dd85653..3df413c38d07 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=595d1e37af6fb03d76728f5e0268b4ab
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.4 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.4
index 39183306fdc6..e1cbfd0a814b 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=595d1e37af6fb03d76728f5e0268b4ab
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.5 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.5
index 2e0b09c61efd..09629e82fed2 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=595d1e37af6fb03d76728f5e0268b4ab
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999 b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
index 8e6d37cc6f2c..1674826d5dcc 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Infrastructure for building robot dashboard plugins in rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_dashboard
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_console[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_nav_view[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_robot_monitor[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4a8e575b3c463cad71cacb847158b782
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.2 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.2
index 9931feeb90dc..8b3b4f1e2c2c 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea67a1223496da31b25ba4036b3c3a45
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.3 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.3
index ed3352275ca4..ee2e8304ad30 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea67a1223496da31b25ba4036b3c3a45
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.2 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.2
index e023abbc6abb..26c935b58d6f 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea67a1223496da31b25ba4036b3c3a45
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.3 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.3
index 1fb2a5c70bc8..6c305daed2a4 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c7d615de272618d62615afb49162cd5
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.4 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.4
index b0e1c03282a2..3dc02cef3309 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c7d615de272618d62615afb49162cd5
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.5 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.5
index 60987a931620..addd316ae777 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5c7d615de272618d62615afb49162cd5
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
index 5bda8581fff2..c1f71778adca 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_monitor-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Displays diagnostics_agg topics messages that are published by diagnostic_aggregator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_monitor
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/python_qt_binding[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_bag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ea67a1223496da31b25ba4036b3c3a45
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.2 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.2
index 180f267b5dc7..b78b85052ef5 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fdbd52e51ec7d5f69de1d917fb78c46
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.3 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.3
index 7231b2f9b1af..1b03bcaa4b75 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fdbd52e51ec7d5f69de1d917fb78c46
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.2 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.2
index 5436e35a4a10..0d236ec04ad6 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fdbd52e51ec7d5f69de1d917fb78c46
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.3 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.3
index 99c1ba93d81f..a737919f7816 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9bcd543b5a0981ae51ab3f6abe81ac3
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.4 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.4
index b74eab21cad1..32e35371481a 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9bcd543b5a0981ae51ab3f6abe81ac3
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.5 b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.5
index d43f2258669b..2d77ff95dca5 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c9bcd543b5a0981ae51ab3f6abe81ac3
diff --git a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999 b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
index c65d2dd96fcc..f0495c2df6b4 100644
--- a/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
+++ b/metadata/md5-cache/dev-ros/rqt_robot_steering-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for steering a robot using Twist messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_robot_steering
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9fdbd52e51ec7d5f69de1d917fb78c46
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.2 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.2
index d37a569a4ff5..785b56a312b1 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8369cff15dab7d4f163a749d3d425a1
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.3 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.3
index 80ecf421dd01..daff3d98c812 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8369cff15dab7d4f163a749d3d425a1
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.2 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.2
index d714135e82ce..0397b53e7380 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8369cff15dab7d4f163a749d3d425a1
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.3 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.3
index 928a784c4af6..c42584efed64 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85a04098ba1204fcc6e39625a0a0f331
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.4 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.4
index 7bdb717a2a95..6251a8ff8f86 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85a04098ba1204fcc6e39625a0a0f331
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.5 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.5
index 5cdc816e04e6..52f4b7cced4f 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=85a04098ba1204fcc6e39625a0a0f331
diff --git a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999 b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
index 41024ebf8235..a4fc7320ca12 100644
--- a/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
+++ b/metadata/md5-cache/dev-ros/rqt_runtime_monitor-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin viewing DiagnosticsArray messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_runtime_monitor
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b8369cff15dab7d4f163a749d3d425a1
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.4.2 b/metadata/md5-cache/dev-ros/rqt_rviz-0.4.2
index 7c3fc6e188f7..347734c1167d 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91450a04f4b42a9de3a541940a682e83
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.4.3 b/metadata/md5-cache/dev-ros/rqt_rviz-0.4.3
index 10301ad161f7..0de056fc9451 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=91450a04f4b42a9de3a541940a682e83
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.2 b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.2
index e7516ee28c5f..4f6754d995d8 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07438a9c57d2b171581238d78162d7a8
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.3 b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.3
index 3dabfb5cc9d3..de9a5d13839b 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3bca75a184d950b50026c28f16a8ce6f
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.4 b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.4
index 74b6a0c46359..a579df00ec3f 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3bca75a184d950b50026c28f16a8ce6f
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.5 b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.5
index 825ff43b7d25..180c04383e54 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3bca75a184d950b50026c28f16a8ce6f
diff --git a/metadata/md5-cache/dev-ros/rqt_rviz-9999 b/metadata/md5-cache/dev-ros/rqt_rviz-9999
index fa6b8844d1ba..ec19c71fb152 100644
--- a/metadata/md5-cache/dev-ros/rqt_rviz-9999
+++ b/metadata/md5-cache/dev-ros/rqt_rviz-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin embedding RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_rviz
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/pluginlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_cpp >=dev-ros/qt_gui_cpp-0.3 dev-qt/qtwidgets:5 dev-ros/rviz dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=07438a9c57d2b171581238d78162d7a8
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.12 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.12
index b8591b601c08..df6d3c3b1c81 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=598aa0210f4e88f9ec0510cc363181ae
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.13 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.13
index e77dca7aafdf..53fedbddcf53 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=598aa0210f4e88f9ec0510cc363181ae
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.0 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.0
index 1c541feb00be..87d2892f4e21 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=598aa0210f4e88f9ec0510cc363181ae
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.1 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.1
index e5c0dba39f81..1b58f23571b4 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68adb9c3f612f31ec83ddcccd677b7c9
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.2 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.2
index 528a4fbf6caa..4fb33b0ede4d 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68adb9c3f612f31ec83ddcccd677b7c9
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.3 b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.3
index f1ee3dc5d85e..92d37df49543 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=68adb9c3f612f31ec83ddcccd677b7c9
diff --git a/metadata/md5-cache/dev-ros/rqt_service_caller-9999 b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
index d48829fd4712..6dd4336f0dd8 100644
--- a/metadata/md5-cache/dev-ros/rqt_service_caller-9999
+++ b/metadata/md5-cache/dev-ros/rqt_service_caller-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for calling arbitrary services
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_service_caller
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosservice[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=598aa0210f4e88f9ec0510cc363181ae
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.3.12 b/metadata/md5-cache/dev-ros/rqt_shell-0.3.12
index 449366be35bd..eed8c195b567 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=008755dcc2bf063458656388172ad105
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.3.13 b/metadata/md5-cache/dev-ros/rqt_shell-0.3.13
index b15b62e56490..7bc8427bbce0 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=008755dcc2bf063458656388172ad105
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.0 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.0
index 58bce44982b5..99895c6f9e07 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=008755dcc2bf063458656388172ad105
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.1 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.1
index c5ff479e51c0..87c962811184 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c075051ae14074db409b69a11e7312d
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.2 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.2
index 3610f55f947c..18b63f05c343 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c075051ae14074db409b69a11e7312d
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-0.4.3 b/metadata/md5-cache/dev-ros/rqt_shell-0.4.3
index be901612f2d1..e43b6cd11195 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_shell-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0c075051ae14074db409b69a11e7312d
diff --git a/metadata/md5-cache/dev-ros/rqt_shell-9999 b/metadata/md5-cache/dev-ros/rqt_shell-9999
index 456e118add2d..e7185635a050 100644
--- a/metadata/md5-cache/dev-ros/rqt_shell-9999
+++ b/metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin providing an interactive shell
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_shell
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui_py_common[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=008755dcc2bf063458656388172ad105
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.3.12 b/metadata/md5-cache/dev-ros/rqt_srv-0.3.12
index b4f0effced49..e582b027130f 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9927ed6ffbc8083ecd8cef43c28e245
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.3.13 b/metadata/md5-cache/dev-ros/rqt_srv-0.3.13
index d2008dd36dae..b0abd1a90d11 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9927ed6ffbc8083ecd8cef43c28e245
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.0 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.0
index f61debf11bee..f1fad1ebd9ab 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9927ed6ffbc8083ecd8cef43c28e245
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.1 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.1
index 144e81c8d770..efceae0fd1bd 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff7f3ab721f351bc066263dbe8f76936
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.2 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.2
index bc739c53088e..a4489056b29a 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff7f3ab721f351bc066263dbe8f76936
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-0.4.3 b/metadata/md5-cache/dev-ros/rqt_srv-0.4.3
index da42a8560420..5a67b866fef9 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_srv-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ff7f3ab721f351bc066263dbe8f76936
diff --git a/metadata/md5-cache/dev-ros/rqt_srv-9999 b/metadata/md5-cache/dev-ros/rqt_srv-9999
index cbb23067f64d..0ae3d5d412bf 100644
--- a/metadata/md5-cache/dev-ros/rqt_srv-9999
+++ b/metadata/md5-cache/dev-ros/rqt_srv-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for introspecting available ROS message types
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_srv
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_msg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e9927ed6ffbc8083ecd8cef43c28e245
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.2 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.2
index 0c31b7cf2057..a983ad6238ba 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.2.tar.gz -> rqt_robot_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6606990ac0e8aac1dc1724362f09c94
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.3 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.3
index b4bb7ffd5f15..5a0827d86d0f 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.4.3.tar.gz -> rqt_robot_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6606990ac0e8aac1dc1724362f09c94
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.2 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.2
index 71e4b6389ac9..23dc4b49bf6d 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.2
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.2.tar.gz -> rqt_robot_plugins-0.5.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6606990ac0e8aac1dc1724362f09c94
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.3 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.3
index 8b2e828edeb2..12242aa23123 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.3
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.3.tar.gz -> rqt_robot_plugins-0.5.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abc68b2dc806631c77357890b3722aee
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.4 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.4
index e9b619a93956..ab01c661fbba 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.4
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.4.tar.gz -> rqt_robot_plugins-0.5.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abc68b2dc806631c77357890b3722aee
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.5 b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.5
index 9df01994e589..36603d0adbd4 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.5
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_robot_plugins/archive/0.5.5.tar.gz -> rqt_robot_plugins-0.5.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=abc68b2dc806631c77357890b3722aee
diff --git a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999 b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
index ea2944ec3f2f..4f1378b89778 100644
--- a/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
+++ b/metadata/md5-cache/dev-ros/rqt_tf_tree-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for visualizing the ROS TF frame tree
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_tf_tree
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_dotgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_graph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e6606990ac0e8aac1dc1724362f09c94
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.3.12 b/metadata/md5-cache/dev-ros/rqt_top-0.3.12
index c33a91cce0f8..3f2fb7d77836 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=222d1ebaf8abd4d5bbb351c888b0033a
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.3.13 b/metadata/md5-cache/dev-ros/rqt_top-0.3.13
index 76f461abd588..c48a3b9a1587 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=222d1ebaf8abd4d5bbb351c888b0033a
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.0 b/metadata/md5-cache/dev-ros/rqt_top-0.4.0
index 9fdfb328f77d..6727b0324a16 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=222d1ebaf8abd4d5bbb351c888b0033a
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.1 b/metadata/md5-cache/dev-ros/rqt_top-0.4.1
index 78b57c13296f..f51c9a72ec69 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b774b656a0c121306747affe02482565
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.2 b/metadata/md5-cache/dev-ros/rqt_top-0.4.2
index 4b73563b4559..00072d01e5fb 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b774b656a0c121306747affe02482565
diff --git a/metadata/md5-cache/dev-ros/rqt_top-0.4.3 b/metadata/md5-cache/dev-ros/rqt_top-0.4.3
index bb63681956c3..0012ef8f9860 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_top-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -10,5 +10,5 @@ RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b774b656a0c121306747affe02482565
diff --git a/metadata/md5-cache/dev-ros/rqt_top-9999 b/metadata/md5-cache/dev-ros/rqt_top-9999
index e253646afd73..0eac5f65c240 100644
--- a/metadata/md5-cache/dev-ros/rqt_top-9999
+++ b/metadata/md5-cache/dev-ros/rqt_top-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=RQT plugin for monitoring ROS processes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_top
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=222d1ebaf8abd4d5bbb351c888b0033a
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.3.12 b/metadata/md5-cache/dev-ros/rqt_topic-0.3.12
index 415d913c1a72..6a44da83e17c 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=130bd182189665a72e1b0f9959de0c65
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.3.13 b/metadata/md5-cache/dev-ros/rqt_topic-0.3.13
index 18b388be66e0..81848c98fbb6 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=130bd182189665a72e1b0f9959de0c65
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.0 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.0
index b371353b4dac..aea477dba0ec 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a0e91688e53440e291e7c1cfb0068ea
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.1 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.1
index 1a3226f0430a..aee95c04b724 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcbecd51554e8a2e52cd5ab647813ca2
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.2 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.2
index 50d0425f8968..7cc177f3fbb9 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcbecd51554e8a2e52cd5ab647813ca2
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-0.4.3 b/metadata/md5-cache/dev-ros/rqt_topic-0.4.3
index 306e556bc847..43ea1eff88a4 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_topic-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bcbecd51554e8a2e52cd5ab647813ca2
diff --git a/metadata/md5-cache/dev-ros/rqt_topic-9999 b/metadata/md5-cache/dev-ros/rqt_topic-9999
index e9b340bd6d1c..5ba555418e5f 100644
--- a/metadata/md5-cache/dev-ros/rqt_topic-9999
+++ b/metadata/md5-cache/dev-ros/rqt_topic-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=GUI plugin for displaying debug information about ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_topic
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-ros/python_qt_binding-0.2.19[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=0a0e91688e53440e291e7c1cfb0068ea
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.3.12 b/metadata/md5-cache/dev-ros/rqt_web-0.3.12
index 545773c02040..4e134333d3c2 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.3.12
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.3.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.12.tar.gz -> rqt_common_plugins-0.3.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8aa1f3cbe21dc8dd22b21f1a2bb9851
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.3.13 b/metadata/md5-cache/dev-ros/rqt_web-0.3.13
index c060fb60c9dc..6f4f51136612 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.3.13
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.3.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.3.13.tar.gz -> rqt_common_plugins-0.3.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8aa1f3cbe21dc8dd22b21f1a2bb9851
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.0 b/metadata/md5-cache/dev-ros/rqt_web-0.4.0
index d72bc1600ab1..c69f3760e48f 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.0
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.0.tar.gz -> rqt_common_plugins-0.4.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8aa1f3cbe21dc8dd22b21f1a2bb9851
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.1 b/metadata/md5-cache/dev-ros/rqt_web-0.4.1
index 7ff6b1887362..e266f730b582 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.1
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.1.tar.gz -> rqt_common_plugins-0.4.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7811ca1fae9bac53b21944b9010f5e08
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.2 b/metadata/md5-cache/dev-ros/rqt_web-0.4.2
index b091b65bc79f..13996d6fff63 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.2
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.2.tar.gz -> rqt_common_plugins-0.4.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7811ca1fae9bac53b21944b9010f5e08
diff --git a/metadata/md5-cache/dev-ros/rqt_web-0.4.3 b/metadata/md5-cache/dev-ros/rqt_web-0.4.3
index a8d98fe7a491..2b78d6bef178 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-0.4.3
+++ b/metadata/md5-cache/dev-ros/rqt_web-0.4.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -10,5 +10,5 @@ RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rqt_common_plugins/archive/0.4.3.tar.gz -> rqt_common_plugins-0.4.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7811ca1fae9bac53b21944b9010f5e08
diff --git a/metadata/md5-cache/dev-ros/rqt_web-9999 b/metadata/md5-cache/dev-ros/rqt_web-9999
index 631686832597..9cb141894037 100644
--- a/metadata/md5-cache/dev-ros/rqt_web-9999
+++ b/metadata/md5-cache/dev-ros/rqt_web-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Simple web content viewer for rqt
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rqt_web
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rqt_gui_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/qt_gui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e8aa1f3cbe21dc8dd22b21f1a2bb9851
diff --git a/metadata/md5-cache/dev-ros/rviz-1.12.4-r1 b/metadata/md5-cache/dev-ros/rviz-1.12.4-r1
index ce7ec9d7cc7c..2b31a5e31155 100644
--- a/metadata/md5-cache/dev-ros/rviz-1.12.4-r1
+++ b/metadata/md5-cache/dev-ros/rviz-1.12.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre 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/urdfdom_headers-1 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf >=dev-ros/urdf-1.12.3-r1 dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre 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/urdfdom_headers-1 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf >=dev-ros/urdf-1.12.3-r1 dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre virtual/openg
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/rviz/archive/1.12.4.tar.gz -> rviz-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ef16c27d156cf52a57313354affda67
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index e6b3f5fee318..f418968a1bcf 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre 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-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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre 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-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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:=[threads] media-libs/assimp dev-games/ogre 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-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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/urdf dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=78bcf387849ac20d20567c94ba323f75
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r2 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r2
index a60ed5af1815..d8aa62383b0f 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r2
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rviz dev-qt/qtcore:4 dev-qt/qtgui:4 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rviz dev-qt/qtcore:4 dev-qt/qtgui:4 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tutorials showing how to write plugins for RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz_plugin_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz dev-qt/qtcore:4 dev-qt/qtgui:4 dev-util/catkin dev-python/e
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da773240f0501abccf835f0bb9c5649d
diff --git a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999 b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
index 6879e805a895..2b359d55d2de 100644
--- a/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/rviz_plugin_tutorials-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rviz dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rviz dev-qt/qtcore:4 dev-qt/qtgui:4 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tutorials showing how to write plugins for RViz
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz_plugin_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rviz dev-qt/qtcore:4 dev-qt/qtgui:4 dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=da773240f0501abccf835f0bb9c5649d
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
index d7ee9daa6f7b..f28acb64f68e 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz_python_tutorial
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f01fae08118d4255cabbbe0d51c3086
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2
index 8fec499b25dd..28ea1eaab899 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz_python_tutorial
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f01fae08118d4255cabbbe0d51c3086
diff --git a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999 b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
index 3b1c1062a409..d5169ee2fb13 100644
--- a/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/rviz_python_tutorial-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tutorials showing how to call into rviz internals from python scripts
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rviz_python_tutorial
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rviz[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f01fae08118d4255cabbbe0d51c3086
diff --git a/metadata/md5-cache/dev-ros/self_test-1.8.10 b/metadata/md5-cache/dev-ros/self_test-1.8.10
index 81db388aef4d..2c9605701437 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.8.10
+++ b/metadata/md5-cache/dev-ros/self_test-1.8.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Robot self-test node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/self_test
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2b854dbbd47428488412746746ee740b
diff --git a/metadata/md5-cache/dev-ros/self_test-1.8.8 b/metadata/md5-cache/dev-ros/self_test-1.8.8
index 553d7fcd1884..dc492abaf066 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.8.8
+++ b/metadata/md5-cache/dev-ros/self_test-1.8.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Robot self-test node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/self_test
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.8.tar.gz -> diagnostics-1.8.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ebce29582aa7c0ad36ff045f50d58ac
diff --git a/metadata/md5-cache/dev-ros/self_test-1.8.9 b/metadata/md5-cache/dev-ros/self_test-1.8.9
index b4aa0ffbfb5b..77b3ce5d6180 100644
--- a/metadata/md5-cache/dev-ros/self_test-1.8.9
+++ b/metadata/md5-cache/dev-ros/self_test-1.8.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Robot self-test node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/self_test
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ro
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.9.tar.gz -> diagnostics-1.8.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ebce29582aa7c0ad36ff045f50d58ac
diff --git a/metadata/md5-cache/dev-ros/self_test-9999 b/metadata/md5-cache/dev-ros/self_test-9999
index 5293d1f7c825..73e8322577ed 100644
--- a/metadata/md5-cache/dev-ros/self_test-9999
+++ b/metadata/md5-cache/dev-ros/self_test-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Robot self-test node
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/self_test
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_msgs dev-ros/diagnostic_updater dev-ros/roscpp dev-ros/rostest dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8ebce29582aa7c0ad36ff045f50d58ac
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.3 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.3
index 389bd582d603..659e5b42aa0b 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sensor_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost dev-util/catkin[python_targets_python2_7(-)?,python_targe
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90fdd340f8f424009ca34e3f23945b7d
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.4 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.4
index 68fe29cf5507..9fd396f891c0 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sensor_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eff612bbd4636a839690d736381e1ddb
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5 b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
index fe4f85e2c8f5..670e327ca314 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sensor_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79957f73c7ea8cfd21575fcc989bfb6c
diff --git a/metadata/md5-cache/dev-ros/sensor_msgs-9999 b/metadata/md5-cache/dev-ros/sensor_msgs-9999
index 4955ee7a1463..7b4488832729 100644
--- a/metadata/md5-cache/dev-ros/sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/sensor_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for commonly used sensors, including cameras and scanning laser rangefinders
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sensor_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=eff612bbd4636a839690d736381e1ddb
diff --git a/metadata/md5-cache/dev-ros/settlerlib-0.10.14 b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
index 291e1e87fd11..a6924120147a 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-0.10.14
+++ b/metadata/md5-cache/dev-ros/settlerlib-0.10.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/rostime test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/rostime test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Helper functions and routines to help creating a settler for a specific sensor channel
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/settlerlib
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/r
 SLOT=0
 SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ed1d4772a161dec0a8a38ab35598910b
diff --git a/metadata/md5-cache/dev-ros/settlerlib-9999 b/metadata/md5-cache/dev-ros/settlerlib-9999
index 0181cd85c36c..07f2bcbdbc26 100644
--- a/metadata/md5-cache/dev-ros/settlerlib-9999
+++ b/metadata/md5-cache/dev-ros/settlerlib-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/rostime test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/rostime test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Helper functions and routines to help creating a settler for a specific sensor channel
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/settlerlib
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/boost:= dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rosconsole dev-ros/rostime dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f00deb964c28ce0228aa249159a132e6
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.3 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.3
index 2196ca11d2d8..58e891e08403 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/shape_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ace985eeb7ee99bc0611c0fde80f3a49
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.4 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.4
index c1aa03ed4575..2d992a852590 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/shape_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ace985eeb7ee99bc0611c0fde80f3a49
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-1.12.5 b/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
index 2712475d4e6f..eb99e65d5479 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/shape_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/shape_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f21cccacf8b92c0694fcd7c94628f0b8
diff --git a/metadata/md5-cache/dev-ros/shape_msgs-9999 b/metadata/md5-cache/dev-ros/shape_msgs-9999
index 18ecb30f4896..a23924646bd3 100644
--- a/metadata/md5-cache/dev-ros/shape_msgs-9999
+++ b/metadata/md5-cache/dev-ros/shape_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining shapes, such as simple solid object primitives, planes, and meshes
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/shape_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ace985eeb7ee99bc0611c0fde80f3a49
diff --git a/metadata/md5-cache/dev-ros/shape_tools-0.2.1 b/metadata/md5-cache/dev-ros/shape_tools-0.2.1
index 73dcc8b063a4..5243838491d3 100644
--- a/metadata/md5-cache/dev-ros/shape_tools-0.2.1
+++ b/metadata/md5-cache/dev-ros/shape_tools-0.2.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tools for operating on shape messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/shape_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_m
 SLOT=0
 SRC_URI=https://github.com/ros-planning/shape_tools/archive/0.2.1.tar.gz -> shape_tools-0.2.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49e4ecf0b8005006f32ae811a9c8ce53
diff --git a/metadata/md5-cache/dev-ros/shape_tools-9999 b/metadata/md5-cache/dev-ros/shape_tools-9999
index a77e27ef2314..f88d2973bc93 100644
--- a/metadata/md5-cache/dev-ros/shape_tools-9999
+++ b/metadata/md5-cache/dev-ros/shape_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Tools for operating on shape messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/shape_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:- src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=49e4ecf0b8005006f32ae811a9c8ce53
diff --git a/metadata/md5-cache/dev-ros/smach-2.0.0 b/metadata/md5-cache/dev-ros/smach-2.0.0
index 8133c07031e0..633d5956c34b 100644
--- a/metadata/md5-cache/dev-ros/smach-2.0.0
+++ b/metadata/md5-cache/dev-ros/smach-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smach
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.0.tar.gz -> executive_smach-2.0.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab5ada491f6cc8b4651c6a5aa20c8f03
diff --git a/metadata/md5-cache/dev-ros/smach-9999 b/metadata/md5-cache/dev-ros/smach-9999
index 833e2d22013e..39a554de5fae 100644
--- a/metadata/md5-cache/dev-ros/smach-9999
+++ b/metadata/md5-cache/dev-ros/smach-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=Task-level architecture for rapidly creating complex robot behavior
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smach
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ab5ada491f6cc8b4651c6a5aa20c8f03
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-2.0.0 b/metadata/md5-cache/dev-ros/smach_msgs-2.0.0
index 1c7f4d6ae2c7..2344dd8196c0 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-2.0.0
+++ b/metadata/md5-cache/dev-ros/smach_msgs-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Set of messages that are used by the introspection interfaces for smach
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smach_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.0.tar.gz -> executive_smach-2.0.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cd4d24bd6fc4e1c4415dc34f90aa20b
diff --git a/metadata/md5-cache/dev-ros/smach_msgs-9999 b/metadata/md5-cache/dev-ros/smach_msgs-9999
index f902fc37a222..1d4fca6c3f78 100644
--- a/metadata/md5-cache/dev-ros/smach_msgs-9999
+++ b/metadata/md5-cache/dev-ros/smach_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Set of messages that are used by the introspection interfaces for smach
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smach_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2cd4d24bd6fc4e1c4415dc34f90aa20b
diff --git a/metadata/md5-cache/dev-ros/smach_ros-2.0.0 b/metadata/md5-cache/dev-ros/smach_ros-2.0.0
index b7766bf2e46f..67c99f38c6c0 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-2.0.0
+++ b/metadata/md5-cache/dev-ros/smach_ros-2.0.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extensions for the SMACH library to integrate it tightly with ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smach_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/executive_smach/archive/2.0.0.tar.gz -> executive_smach-2.0.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2049d831eed0a9701104b761da1b8fa
diff --git a/metadata/md5-cache/dev-ros/smach_ros-9999 b/metadata/md5-cache/dev-ros/smach_ros-9999
index cc5102aaa1aa..bc5d707a7df2 100644
--- a/metadata/md5-cache/dev-ros/smach_ros-9999
+++ b/metadata/md5-cache/dev-ros/smach_ros-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extensions for the SMACH library to integrate it tightly with ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smach_ros
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostopic[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/smach_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b2049d831eed0a9701104b761da1b8fa
diff --git a/metadata/md5-cache/dev-ros/smclib-1.7.16 b/metadata/md5-cache/dev-ros/smclib-1.7.16
index e750dbcee9e1..e95c97f6e1c2 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.7.16
+++ b/metadata/md5-cache/dev-ros/smclib-1.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=The State Machine Compiler (SMC) converts the description of a state machine into source code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smclib
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.16.tar.gz -> bond_core-1.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ee7971aadb37f08c393ae7036665aa3
diff --git a/metadata/md5-cache/dev-ros/smclib-1.7.17 b/metadata/md5-cache/dev-ros/smclib-1.7.17
index e718f3ac32e7..48390814e3f2 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.7.17
+++ b/metadata/md5-cache/dev-ros/smclib-1.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=The State Machine Compiler (SMC) converts the description of a state machine into source code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smclib
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.17.tar.gz -> bond_core-1.7.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ee7971aadb37f08c393ae7036665aa3
diff --git a/metadata/md5-cache/dev-ros/smclib-1.7.18 b/metadata/md5-cache/dev-ros/smclib-1.7.18
index 2827acc2d8af..f18dc5796f73 100644
--- a/metadata/md5-cache/dev-ros/smclib-1.7.18
+++ b/metadata/md5-cache/dev-ros/smclib-1.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=The State Machine Compiler (SMC) converts the description of a state machine into source code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smclib
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.18.tar.gz -> bond_core-1.7.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa76a8a8b806c9af0993c546d91afbe4
diff --git a/metadata/md5-cache/dev-ros/smclib-9999 b/metadata/md5-cache/dev-ros/smclib-9999
index 10c668f2ee7f..952f62773318 100644
--- a/metadata/md5-cache/dev-ros/smclib-9999
+++ b/metadata/md5-cache/dev-ros/smclib-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 DESCRIPTION=The State Machine Compiler (SMC) converts the description of a state machine into source code
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/smclib
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6ee7971aadb37f08c393ae7036665aa3
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.2.12 b/metadata/md5-cache/dev-ros/sound_play-0.2.12
index d4c1e3dd5837..b31b70a313f6 100644
--- a/metadata/md5-cache/dev-ros/sound_play-0.2.12
+++ b/metadata/md5-cache/dev-ros/sound_play-0.2.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:0.10 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:0.10 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sound_play
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.2.12.tar.gz -> audio_common-0.2.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3ce8c3b0c453cfbd25cdebd21e3b6285
diff --git a/metadata/md5-cache/dev-ros/sound_play-0.3.1 b/metadata/md5-cache/dev-ros/sound_play-0.3.1
index df400a8a3c54..156cb2e066cb 100644
--- a/metadata/md5-cache/dev-ros/sound_play-0.3.1
+++ b/metadata/md5-cache/dev-ros/sound_play-0.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sound_play
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23173d415f902879f563bbb4fa286259
diff --git a/metadata/md5-cache/dev-ros/sound_play-9999 b/metadata/md5-cache/dev-ros/sound_play-9999
index 1c9a67c7acc7..8ad38ffacd08 100644
--- a/metadata/md5-cache/dev-ros/sound_play-9999
+++ b/metadata/md5-cache/dev-ros/sound_play-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=ROS node that translates commands on a ROS topic (robotsound) into sounds
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/sound_play
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/diagnostic_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/gst-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-accessibility/festival media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=23173d415f902879f563bbb4fa286259
diff --git a/metadata/md5-cache/dev-ros/stage_ros-1.7.5 b/metadata/md5-cache/dev-ros/stage_ros-1.7.5
index 023d4a761b4f..5c5c15e2d30c 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-1.7.5
+++ b/metadata/md5-cache/dev-ros/stage_ros-1.7.5
@@ -1,5 +1,5 @@
 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 dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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 dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS specific hooks and tools for the Stage simulator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stage_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/geometry_msgs dev-ros/nav_msgs dev-ros
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/stage_ros/archive/1.7.5.tar.gz -> stage_ros-1.7.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8082644286103dabb73d57fd0d2dbeca
diff --git a/metadata/md5-cache/dev-ros/stage_ros-9999 b/metadata/md5-cache/dev-ros/stage_ros-9999
index d6eaf4c3d4ac..bf85537034d0 100644
--- a/metadata/md5-cache/dev-ros/stage_ros-9999
+++ b/metadata/md5-cache/dev-ros/stage_ros-9999
@@ -1,5 +1,5 @@
 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 dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+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 dev-ros/std_srvs[ros_messages_cxx(-)] test? ( dev-ros/rostest ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS specific hooks and tools for the Stage simulator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stage_ros
@@ -8,5 +8,5 @@ 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 dev-ros/std_srvs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8082644286103dabb73d57fd0d2dbeca
diff --git a/metadata/md5-cache/dev-ros/std_msgs-0.5.10 b/metadata/md5-cache/dev-ros/std_msgs-0.5.10
index ea53d9dadf29..3d5a08df921a 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.10
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.10
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Standard ROS Messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/std_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/std_msgs/archive/0.5.10.tar.gz -> std_msgs-0.5.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17887a59e7c1df4a698d3a8294c5382f
diff --git a/metadata/md5-cache/dev-ros/std_msgs-0.5.9 b/metadata/md5-cache/dev-ros/std_msgs-0.5.9
index d2b9599747a0..929a7acb58d3 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-0.5.9
+++ b/metadata/md5-cache/dev-ros/std_msgs-0.5.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Standard ROS Messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/std_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/std_msgs/archive/0.5.9.tar.gz -> std_msgs-0.5.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17887a59e7c1df4a698d3a8294c5382f
diff --git a/metadata/md5-cache/dev-ros/std_msgs-9999 b/metadata/md5-cache/dev-ros/std_msgs-9999
index 6007ce86cc97..60a22e36aa25 100644
--- a/metadata/md5-cache/dev-ros/std_msgs-9999
+++ b/metadata/md5-cache/dev-ros/std_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Standard ROS Messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/std_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=17887a59e7c1df4a698d3a8294c5382f
diff --git a/metadata/md5-cache/dev-ros/std_srvs-1.11.1 b/metadata/md5-cache/dev-ros/std_srvs-1.11.1
index 3d0167382840..5957e312ea52 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.1
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/std_srvs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.1.tar.gz -> ros_comm_msgs-1.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75e95fa5d970adc662d70bb3b57aa2e2
diff --git a/metadata/md5-cache/dev-ros/std_srvs-1.11.2 b/metadata/md5-cache/dev-ros/std_srvs-1.11.2
index 912c11193bd7..b743c45f6e22 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-1.11.2
+++ b/metadata/md5-cache/dev-ros/std_srvs-1.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/std_srvs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm_msgs/archive/1.11.2.tar.gz -> ros_comm_msgs-1.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75e95fa5d970adc662d70bb3b57aa2e2
diff --git a/metadata/md5-cache/dev-ros/std_srvs-9999 b/metadata/md5-cache/dev-ros/std_srvs-9999
index bd003d05ebb7..f85819ae0b2e 100644
--- a/metadata/md5-cache/dev-ros/std_srvs-9999
+++ b/metadata/md5-cache/dev-ros/std_srvs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Messages relating to ROS comm
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/std_srvs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=75e95fa5d970adc662d70bb3b57aa2e2
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
index 76c79546f4cc..c13ace3b32fa 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
@@ -1,5 +1,5 @@
 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 dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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 dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_image_proc
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d65296fdfa5e71820926e1c8b760ca9
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-9999 b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
index 37b7144af328..a23d0cab33ca 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -1,5 +1,5 @@
 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 dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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 dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_image_proc
@@ -8,5 +8,5 @@ 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 dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d65296fdfa5e71820926e1c8b760ca9
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
index 3294cea1e948..9c7179e8cfc1 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35f016ca4d5d1b5cd5d6e0324343f4f7
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
index 095279560fbc..baf686d80bf8 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35f016ca4d5d1b5cd5d6e0324343f4f7
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5 b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
index bc2d7b4c46c1..ba70fb815075 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8fc74964c2d6c7fd7736c9d6268ab94d
diff --git a/metadata/md5-cache/dev-ros/stereo_msgs-9999 b/metadata/md5-cache/dev-ros/stereo_msgs-9999
index 0444c426d9e3..569e907a9aa3 100644
--- a/metadata/md5-cache/dev-ros/stereo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/stereo_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages specific to stereo processing, such as disparity images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35f016ca4d5d1b5cd5d6e0324343f4f7
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.7.16 b/metadata/md5-cache/dev-ros/test_bond-1.7.16
index 86e09f32832b..a7643a25e620 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.7.16
+++ b/metadata/md5-cache/dev-ros/test_bond-1.7.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_bond
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.16.tar.gz -> bond_core-1.7.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=36a6d0042cad67b82b793dbdd726cedc
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.7.17 b/metadata/md5-cache/dev-ros/test_bond-1.7.17
index a05aa178b0ff..0ab007804b20 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.7.17
+++ b/metadata/md5-cache/dev-ros/test_bond-1.7.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_bond
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.17.tar.gz -> bond_core-1.7.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=36a6d0042cad67b82b793dbdd726cedc
diff --git a/metadata/md5-cache/dev-ros/test_bond-1.7.18 b/metadata/md5-cache/dev-ros/test_bond-1.7.18
index 66c5b4f0f266..d5042a10a8d4 100644
--- a/metadata/md5-cache/dev-ros/test_bond-1.7.18
+++ b/metadata/md5-cache/dev-ros/test_bond-1.7.18
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_bond
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_sing
 SLOT=0
 SRC_URI=https://github.com/ros/bond_core/archive/1.7.18.tar.gz -> bond_core-1.7.18.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c3a07b0d90ff6ebada595924fbd8aa11
diff --git a/metadata/md5-cache/dev-ros/test_bond-9999 b/metadata/md5-cache/dev-ros/test_bond-9999
index b48d9f69dc95..24a26819251b 100644
--- a/metadata/md5-cache/dev-ros/test_bond-9999
+++ b/metadata/md5-cache/dev-ros/test_bond-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Tests for bond, bondpy and bondcpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_bond
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/bondcpp dev-ros/bondpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=36a6d0042cad67b82b793dbdd726cedc
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10
index a1785c64e415..6dc84ec46b54 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_diagnostic_aggregator
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib
 SLOT=0
 SRC_URI=https://github.com/ros/diagnostics/archive/1.8.10.tar.gz -> diagnostics-1.8.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=772695acb1a7f478f73bdb724c5ff04d
diff --git a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999 b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
index f7b7593ec7b3..8e87999aac2f 100644
--- a/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=diagnostic_aggregator tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_diagnostic_aggregator
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/diagnostic_aggregator dev-ros/diagnostic_msgs dev-ros/pluginlib dev-ros/roscpp dev-ros/rospy dev-ros/rostest dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35baa1eddf2e8f8981cfc03892dd3f1a
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.3 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.3
index eab61ab53915..e6851763d01a 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.3
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) r
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.3.tar.gz -> nodelet_core-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=35e59825e7f92f6c434773a679e73566
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.4 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.4
index 6e4a3dac3ab4..1e2f14db79de 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.4
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.4
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) r
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.4.tar.gz -> nodelet_core-1.9.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c02ec07edf193b38f5732f0ffea9ac1
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.5 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.5
index 3bbd35b2a056..48cf6342bc63 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.5
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.5
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) r
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.5.tar.gz -> nodelet_core-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90aa18633286d81d3f598fae6563187c
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.6 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.6
index 7f2d832ac012..34824c25bb02 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.6
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.6
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) r
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.6.tar.gz -> nodelet_core-1.9.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90aa18633286d81d3f598fae6563187c
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.7 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.7
index 9a6be2b927f5..21b22d6ea679 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.7
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.7
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) r
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.7.tar.gz -> nodelet_core-1.9.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90aa18633286d81d3f598fae6563187c
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-1.9.8 b/metadata/md5-cache/dev-ros/test_nodelet-1.9.8
index f71b77a4b1d2..e67a3e5becff 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-1.9.8
+++ b/metadata/md5-cache/dev-ros/test_nodelet-1.9.8
@@ -1,5 +1,5 @@
 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 ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) r
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.8.tar.gz -> nodelet_core-1.9.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90aa18633286d81d3f598fae6563187c
diff --git a/metadata/md5-cache/dev-ros/test_nodelet-9999 b/metadata/md5-cache/dev-ros/test_nodelet-9999
index fecfd5a03a61..a357dcfa3f2b 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet-9999
@@ -1,5 +1,5 @@
 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 ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=test? ( dev-ros/nodelet dev-ros/pluginlib dev-ros/rostest dev-libs/boost dev-cpp/gtest dev-ros/rosbash ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=2c02ec07edf193b38f5732f0ffea9ac1
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.3 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.3
index 57e4cd79625e..7a99dec7be96 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.3
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.3
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.3.tar.gz -> nodelet_core-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90020bb0cf848dc061241cc4e7d437b2
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.4 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.4
index a3a7d8e90f24..89559445f70e 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.4
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.4
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.4.tar.gz -> nodelet_core-1.9.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90020bb0cf848dc061241cc4e7d437b2
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.5 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.5
index 9da16683516c..c4379aab18fe 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.5
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.5
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.5.tar.gz -> nodelet_core-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52bae0295460191039cd895579a9d3cf
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.6 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.6
index 7237fe1b68da..66d2713b9494 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.6
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.6
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.6.tar.gz -> nodelet_core-1.9.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52bae0295460191039cd895579a9d3cf
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.7 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.7
index c02f916692c1..d953641346a9 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.7
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.7
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.7.tar.gz -> nodelet_core-1.9.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52bae0295460191039cd895579a9d3cf
diff --git a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.8 b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.8
index 89a2c5b77fbc..b591f8ed4f38 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.8
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.8
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-
 SLOT=0
 SRC_URI=https://github.com/ros/nodelet_core/archive/1.9.8.tar.gz -> nodelet_core-1.9.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=52bae0295460191039cd895579a9d3cf
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 f2bdabe5b1b3..a754d5c912c9 100644
--- a/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
@@ -1,5 +1,5 @@
 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 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg
 DESCRIPTION=Nodelet topic tools unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_nodelet_topic_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/nodelet_topic_tools dev-ros/pluginlib dev-ros/roscpp dev-ros/rostest dev-util/catkin dev-python/empy ros_messages_cxx? ( dev-ros/gencpp:= ) ros_messages_eus? ( dev-ros/geneus:= ) ros_messages_python? ( dev-ros/genpy:= ) ros_messages_lisp? ( dev-ros/genlisp:= ) ros_messages_nodejs? ( dev-ros/gennodejs:= ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=90020bb0cf848dc061241cc4e7d437b2
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.11.14 b/metadata/md5-cache/dev-ros/test_rosbag-1.11.14
index b82d63caebb1..8aae874eabe4 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.11.15 b/metadata/md5-cache/dev-ros/test_rosbag-1.11.15
index f5a1c72ccb79..b9482eeaa1b7 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.11.16 b/metadata/md5-cache/dev-ros/test_rosbag-1.11.16
index 4a9254f49cec..dce0630c11e5 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.11.17 b/metadata/md5-cache/dev-ros/test_rosbag-1.11.17
index 9f1ac47a861d..e76cd83e88a1 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.12.0 b/metadata/md5-cache/dev-ros/test_rosbag-1.12.0
index 356231cbcc2c..9434c379dc6c 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.12.1 b/metadata/md5-cache/dev-ros/test_rosbag-1.12.1
index e6629f04803f..b663b4499673 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.12.2 b/metadata/md5-cache/dev-ros/test_rosbag-1.12.2
index d8e2024982e7..1d613de62c27 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e19fb97e45b81afb76b44943aa0007a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.12.4 b/metadata/md5-cache/dev-ros/test_rosbag-1.12.4
index 8288ef017506..b7dc584415b9 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e19fb97e45b81afb76b44943aa0007a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.12.5 b/metadata/md5-cache/dev-ros/test_rosbag-1.12.5
index 1859897ec720..3202223d27c4 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e19fb97e45b81afb76b44943aa0007a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-1.12.6 b/metadata/md5-cache/dev-ros/test_rosbag-1.12.6
index b921b3f06899..324f0a1f6a6e 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rosbag-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1e19fb97e45b81afb76b44943aa0007a
diff --git a/metadata/md5-cache/dev-ros/test_rosbag-9999 b/metadata/md5-cache/dev-ros/test_rosbag-9999
index 3565765cc0cc..429de0a03217 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp test? ( dev-libs/boost[threads] app-arch/bzip2 dev-ros/rosout dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rosbag
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/message_generation dev-ros/rosbag[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/topic_tools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/xmlrpcpp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84d1f793da9414e102662cefe83f00a4
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.14 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.14
index d5a743a19e33..f881d27feaf5 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.15 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.15
index b28b74cdd5a5..113769b07098 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.16 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.16
index 67a1108d8114..0861f53c9236 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.17 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.17
index a4d9e864a9b8..30670c3383cd 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.0 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.0
index 638004e78d6f..286721e1376b 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.1 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.1
index 744105fca441..73a0ada03d69 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.2 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.2
index c0f0c8911f69..a2c0bbd61347 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=474c382f9be9fa85ed7542b7d847cafc
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.4 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.4
index 7eb82cccfee7..625f28fea082 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=474c382f9be9fa85ed7542b7d847cafc
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.5 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.5
index d75dc7544264..051e9e3653fd 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=474c382f9be9fa85ed7542b7d847cafc
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.6 b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.6
index 1c034ea493ab..f01b067b183d 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=474c382f9be9fa85ed7542b7d847cafc
diff --git a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999 b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
index 0a48f1ac4230..90eb33cb528e 100644
--- a/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
+++ b/metadata/md5-cache/dev-ros/test_rosbag_storage-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/rosbag_storage dev-ros/std_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Unit tests for rosbag_storage
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosbag_storage
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1c6a2d63e6939d210daa787a978ed598
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.11.14 b/metadata/md5-cache/dev-ros/test_roscpp-1.11.14
index e106c3a335b2..e4ffa6d8b4c2 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.11.15 b/metadata/md5-cache/dev-ros/test_roscpp-1.11.15
index 3100c306428a..fed8c88a692b 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.11.16 b/metadata/md5-cache/dev-ros/test_roscpp-1.11.16
index 507b2a7a340a..fa89d6ff3931 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.11.17 b/metadata/md5-cache/dev-ros/test_roscpp-1.11.17
index 104a4a1e2e0a..46a3b3fb7fba 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.12.0 b/metadata/md5-cache/dev-ros/test_roscpp-1.12.0
index cf3d67410f39..bfe8c0f17983 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.12.1 b/metadata/md5-cache/dev-ros/test_roscpp-1.12.1
index 91d478368824..64b1b991b5bf 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.12.2 b/metadata/md5-cache/dev-ros/test_roscpp-1.12.2
index 24eb5e998f3f..b2fba7512669 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b84fbe791f123ac1a593cb92dbbd758
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.12.4 b/metadata/md5-cache/dev-ros/test_roscpp-1.12.4
index 8f1029635ca7..77564c5307fa 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b84fbe791f123ac1a593cb92dbbd758
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.12.5 b/metadata/md5-cache/dev-ros/test_roscpp-1.12.5
index 0fb1b2a9a1ff..106d8c30c08a 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b84fbe791f123ac1a593cb92dbbd758
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-1.12.6 b/metadata/md5-cache/dev-ros/test_roscpp-1.12.6
index a22f17d2e558..5cfadea8ca3b 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_roscpp-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8b84fbe791f123ac1a593cb92dbbd758
diff --git a/metadata/md5-cache/dev-ros/test_roscpp-9999 b/metadata/md5-cache/dev-ros/test_roscpp-9999
index c861310247e0..9e87efe94d9d 100644
--- a/metadata/md5-cache/dev-ros/test_roscpp-9999
+++ b/metadata/md5-cache/dev-ros/test_roscpp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roscpp
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roscpp
@@ -9,5 +9,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 REQUIRED_USE=test? ( ros_messages_cxx )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fccbf9ab379bf9927bbfc4860ea8fa53
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.14 b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.14
index e55f8c14caf2..6ca135dc4489 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.15 b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.15
index 5c3f1b45192b..f2b1e9d1b164 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.16 b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.16
index 7b9fe7ce9ee9..dfe894ded61f 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.17 b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.17
index 750424949a84..f04f393be8d7 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.0 b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.0
index 059f137ee041..43a689ff2910 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.1 b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.1
index a8e31571a572..943b3629ebbe 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.2 b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.2
index 9213ae05eb1d..87440b89ebde 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87b9f0799008b1771316af63beb8412a
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.4 b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.4
index adca1ad19317..76253e2698d7 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87b9f0799008b1771316af63beb8412a
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.5 b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.5
index e70103d0d73d..28ff27628209 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87b9f0799008b1771316af63beb8412a
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.6 b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.6
index b8156e51afa0..d05ebe0f0fc2 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=87b9f0799008b1771316af63beb8412a
diff --git a/metadata/md5-cache/dev-ros/test_rosgraph-9999 b/metadata/md5-cache/dev-ros/test_rosgraph-9999
index 45d5736f7bde..2e8eba1c9816 100644
--- a/metadata/md5-cache/dev-ros/test_rosgraph-9999
+++ b/metadata/md5-cache/dev-ros/test_rosgraph-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosgraph
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosgraph
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f8f2207d44103f5573e0b6cccc06bfa0
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.11.16-r1 b/metadata/md5-cache/dev-ros/test_roslaunch-1.11.16-r1
index 37d9f84d39b4..23c47ec86995 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.11.16-r1
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.11.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe094216455e5451b0d74da488e69be4
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.11.17 b/metadata/md5-cache/dev-ros/test_roslaunch-1.11.17
index 7beed149e579..ceff74d3c000 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe094216455e5451b0d74da488e69be4
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.0 b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.0
index 031d83f2dfe8..c5b5a8c19ed1 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe094216455e5451b0d74da488e69be4
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.1 b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.1
index 78d530f366f6..ac8df62cbf18 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe094216455e5451b0d74da488e69be4
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.2 b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.2
index 62e8d174adf3..e82411619c5f 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97b7b8d0fcefc2280948961aab70bfcd
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.4 b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.4
index 894734ad81e4..97a138a0758e 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97b7b8d0fcefc2280948961aab70bfcd
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.5 b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.5
index dc9359c9c3bc..56174b89687a 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97b7b8d0fcefc2280948961aab70bfcd
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.6 b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.6
index bb066479773e..e5452599db7f 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=97b7b8d0fcefc2280948961aab70bfcd
diff --git a/metadata/md5-cache/dev-ros/test_roslaunch-9999 b/metadata/md5-cache/dev-ros/test_roslaunch-9999
index 989b3e3ee6b9..1a3614185369 100644
--- a/metadata/md5-cache/dev-ros/test_roslaunch-9999
+++ b/metadata/md5-cache/dev-ros/test_roslaunch-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for roslaunch
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslaunch
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fe094216455e5451b0d74da488e69be4
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.14 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.14
index 3d1e5635ac7a..c94384d73edd 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.15 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.15
index eda9e554d2e3..63785af14d30 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.16 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.16
index 4d4db8fe3790..5eb1cc9df89e 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.17 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.17
index 1f781bde464f..66605f64d7da 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.0 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.0
index ef353ddaf825..c3064c2290a7 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.1 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.1
index 8a4a501ba589..2f24d9e48848 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.2 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.2
index b53e88e2eb6a..9f6ae82b1ff2 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c962d50258d90f43bfa00fa65bbad09
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.4 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.4
index 2420fd3ed1b3..3b4d6241b49b 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c962d50258d90f43bfa00fa65bbad09
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.5 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.5
index 8b62d46ba1de..fb386fcfafcc 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c962d50258d90f43bfa00fa65bbad09
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.6 b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.6
index f6db4c4c5c6e..da551d81625c 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7c962d50258d90f43bfa00fa65bbad09
diff --git a/metadata/md5-cache/dev-ros/test_roslib_comm-9999 b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
index d4a370688d8f..e3a0263777de 100644
--- a/metadata/md5-cache/dev-ros/test_roslib_comm-9999
+++ b/metadata/md5-cache/dev-ros/test_roslib_comm-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for roslib
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_roslib_comm
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6c26ad31185d576cc8760ddd69a5726c
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.14 b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.14
index 795972cb2f18..44b3860fdc4d 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=389fc2fc41ecdbd9cae47e2f63548c5c
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.15 b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.15
index 70581ad96772..01131d514959 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=389fc2fc41ecdbd9cae47e2f63548c5c
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.16 b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.16
index 3026b9592c9d..7e81f6a9ec9b 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d6f8affb0893c1ec7706c40c1602e58
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.17 b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.17
index 4a16506c4cd7..84afe249a55d 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d6f8affb0893c1ec7706c40c1602e58
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.0 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.0
index 2ac23a64b164..9671c62a338b 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d6f8affb0893c1ec7706c40c1602e58
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.1 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.1
index 0de487be53e1..693452c00889 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d6f8affb0893c1ec7706c40c1602e58
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.2 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.2
index 4d0c5d4bbbbf..fca12d47350a 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8283ba5e68acd3ee95e4631f78867ae3
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.4 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.4
index 9d8ad8b657d0..3c2c6245cddf 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8283ba5e68acd3ee95e4631f78867ae3
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.5 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.5
index 9940ce9c4a4e..2f7cbc0db9b9 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8283ba5e68acd3ee95e4631f78867ae3
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.6 b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.6
index 63ed17ea7c3b..9b39bae40333 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_pyth
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=8283ba5e68acd3ee95e4631f78867ae3
diff --git a/metadata/md5-cache/dev-ros/test_rosmaster-9999 b/metadata/md5-cache/dev-ros/test_rosmaster-9999
index 5ceb41a3c739..8ffe59c136ea 100644
--- a/metadata/md5-cache/dev-ros/test_rosmaster-9999
+++ b/metadata/md5-cache/dev-ros/test_rosmaster-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosmaster
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosmaster
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:-
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d6f8affb0893c1ec7706c40c1602e58
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.11.14 b/metadata/md5-cache/dev-ros/test_rosparam-1.11.14
index 12d1084077a9..f70a97ccf6a8 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.11.15 b/metadata/md5-cache/dev-ros/test_rosparam-1.11.15
index 69c80b8fd928..45c86dde5875 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.11.16 b/metadata/md5-cache/dev-ros/test_rosparam-1.11.16
index 6c430d7f4100..65ea400641e5 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.11.17 b/metadata/md5-cache/dev-ros/test_rosparam-1.11.17
index 6d48f20f9493..c777d35e59df 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.12.0 b/metadata/md5-cache/dev-ros/test_rosparam-1.12.0
index 4735919fe668..8425fa975dc1 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.12.1 b/metadata/md5-cache/dev-ros/test_rosparam-1.12.1
index 9e6e4401ecf1..57f7bc889f3f 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.12.2 b/metadata/md5-cache/dev-ros/test_rosparam-1.12.2
index cc55a0652df9..7b371d57cc9f 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=916cf757c5c4f0033ff8d9f0300fc0d6
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.12.4 b/metadata/md5-cache/dev-ros/test_rosparam-1.12.4
index 91fc58bc0d98..d71c08ee56f8 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=916cf757c5c4f0033ff8d9f0300fc0d6
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.12.5 b/metadata/md5-cache/dev-ros/test_rosparam-1.12.5
index 232d1cae1d8d..3dad93e95d89 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=916cf757c5c4f0033ff8d9f0300fc0d6
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-1.12.6 b/metadata/md5-cache/dev-ros/test_rosparam-1.12.6
index 8d6d442dd525..cf6490e49392 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rosparam-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=916cf757c5c4f0033ff8d9f0300fc0d6
diff --git a/metadata/md5-cache/dev-ros/test_rosparam-9999 b/metadata/md5-cache/dev-ros/test_rosparam-9999
index 103d49f52f5d..cd4cfafb1d5e 100644
--- a/metadata/md5-cache/dev-ros/test_rosparam-9999
+++ b/metadata/md5-cache/dev-ros/test_rosparam-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosparam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Unit tests for rosparam
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosparam
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26a3b1c1d3db2f85d634fc916fa160be
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.11.14 b/metadata/md5-cache/dev-ros/test_rospy-1.11.14
index 0f36078325eb..5df872e162ca 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.11.15 b/metadata/md5-cache/dev-ros/test_rospy-1.11.15
index 2becabfda60f..53e3c754388c 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.11.16 b/metadata/md5-cache/dev-ros/test_rospy-1.11.16
index 6233cee4d63f..370e40d2cb82 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.11.17 b/metadata/md5-cache/dev-ros/test_rospy-1.11.17
index e6dea617ad20..da7da8ab24be 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.0 b/metadata/md5-cache/dev-ros/test_rospy-1.12.0
index 6e730f8b01d2..b811f19e43dd 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.1 b/metadata/md5-cache/dev-ros/test_rospy-1.12.1
index 65e6c6cf0de2..ce333232bc81 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.2 b/metadata/md5-cache/dev-ros/test_rospy-1.12.2
index 0e58f5b3ff96..c248ab378e07 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84abd2a173cd26750d5b0493a6c1fe48
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.4 b/metadata/md5-cache/dev-ros/test_rospy-1.12.4
index 6bfc87bb91fd..48cf1d26a22d 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84abd2a173cd26750d5b0493a6c1fe48
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.5 b/metadata/md5-cache/dev-ros/test_rospy-1.12.5
index bc523bf9cae9..e2a0ede87aaf 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84abd2a173cd26750d5b0493a6c1fe48
diff --git a/metadata/md5-cache/dev-ros/test_rospy-1.12.6 b/metadata/md5-cache/dev-ros/test_rospy-1.12.6
index 50b8f23b0495..6d3b8f20f09d 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rospy-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=84abd2a173cd26750d5b0493a6c1fe48
diff --git a/metadata/md5-cache/dev-ros/test_rospy-9999 b/metadata/md5-cache/dev-ros/test_rospy-9999
index 9b9d114a4f46..3ac3e5550430 100644
--- a/metadata/md5-cache/dev-ros/test_rospy-9999
+++ b/metadata/md5-cache/dev-ros/test_rospy-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosbuild dev-ros/rosgraph[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rospy
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3f2fe9fd9cf7d89536fd760dcf02ee8f
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.11.14 b/metadata/md5-cache/dev-ros/test_rosservice-1.11.14
index efa18f0f8753..49f1e2011097 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.11.14
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.11.15 b/metadata/md5-cache/dev-ros/test_rosservice-1.11.15
index 9cabbcea150c..2864b66cd6e3 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.11.15
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.11.15
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.11.16 b/metadata/md5-cache/dev-ros/test_rosservice-1.11.16
index f2308c07bf84..4e3a1d7b95eb 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.11.16
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.11.16
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.11.17 b/metadata/md5-cache/dev-ros/test_rosservice-1.11.17
index 4cc2873ff492..cc447df4f842 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.11.17
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.12.0 b/metadata/md5-cache/dev-ros/test_rosservice-1.12.0
index 7fa1e4ef7a35..ff60507de1c4 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.12.0
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.12.1 b/metadata/md5-cache/dev-ros/test_rosservice-1.12.1
index 8d8cb91d3a0f..8286027dd29d 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.12.1
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.12.2 b/metadata/md5-cache/dev-ros/test_rosservice-1.12.2
index d8f9f3cfa950..d775edf0fce1 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.12.2
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dc24500917b501f5c67035154cb0cbb
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.12.4 b/metadata/md5-cache/dev-ros/test_rosservice-1.12.4
index 191485096c49..37aa3a667361 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.12.4
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dc24500917b501f5c67035154cb0cbb
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.12.5 b/metadata/md5-cache/dev-ros/test_rosservice-1.12.5
index 3f29adca6735..3cc36f6c5d4b 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.12.5
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dc24500917b501f5c67035154cb0cbb
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-1.12.6 b/metadata/md5-cache/dev-ros/test_rosservice-1.12.6
index e2d05c57e894..d0c1e51102e1 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-1.12.6
+++ b/metadata/md5-cache/dev-ros/test_rosservice-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7dc24500917b501f5c67035154cb0cbb
diff --git a/metadata/md5-cache/dev-ros/test_rosservice-9999 b/metadata/md5-cache/dev-ros/test_rosservice-9999
index a4a0256f2eb4..121fafb5c5ac 100644
--- a/metadata/md5-cache/dev-ros/test_rosservice-9999
+++ b/metadata/md5-cache/dev-ros/test_rosservice-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/test_rosmaster[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Unit tests for rospy
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_rosservice
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c79c4182ea51068ea5c0d3516deef9df
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.5.12-r1 b/metadata/md5-cache/dev-ros/test_tf2-0.5.12-r1
index 232f0a181047..8587300c36f5 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.5.12-r1
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.5.12-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_tf2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f98dd2916a1bb4b5fed54b5051cb5d9
diff --git a/metadata/md5-cache/dev-ros/test_tf2-0.5.13 b/metadata/md5-cache/dev-ros/test_tf2-0.5.13
index d567be6330f8..a0164ffb93ab 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-0.5.13
+++ b/metadata/md5-cache/dev-ros/test_tf2-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_tf2
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f98dd2916a1bb4b5fed54b5051cb5d9
diff --git a/metadata/md5-cache/dev-ros/test_tf2-9999 b/metadata/md5-cache/dev-ros/test_tf2-9999
index 5492a88384f3..5ae9f0a58793 100644
--- a/metadata/md5-cache/dev-ros/test_tf2-9999
+++ b/metadata/md5-cache/dev-ros/test_tf2-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf dev-ros/tf2 dev-ros/tf2_bullet dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_msgs sci-libs/orocos_kdl dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-cpp/gtest >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 unit tests
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/test_tf2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9f98dd2916a1bb4b5fed54b5051cb5d9
diff --git a/metadata/md5-cache/dev-ros/tf-1.11.8 b/metadata/md5-cache/dev-ros/tf-1.11.8
index c58bd82206cd..9d9be3cb05ef 100644
--- a/metadata/md5-cache/dev-ros/tf-1.11.8
+++ b/metadata/md5-cache/dev-ros/tf-1.11.8
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Maintains the relationship between coordinate frames in a tree structure buffered in time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/angles dev-ros/message_filters dev-ros
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.8.tar.gz -> geometry-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=30116a6b9a75f02766181da3406fb0c4
diff --git a/metadata/md5-cache/dev-ros/tf-9999 b/metadata/md5-cache/dev-ros/tf-9999
index 998e6f7262fa..62627bb69b56 100644
--- a/metadata/md5-cache/dev-ros/tf-9999
+++ b/metadata/md5-cache/dev-ros/tf-9999
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Maintains the relationship between coordinate frames in a tree structure buffered in time
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf
@@ -8,5 +8,5 @@ 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rospkg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4d5fd2a08421ebd71504d2d45f3db8e5
diff --git a/metadata/md5-cache/dev-ros/tf2-0.5.13 b/metadata/md5-cache/dev-ros/tf2-0.5.13
index 5f59e960562c..641cb262934e 100644
--- a/metadata/md5-cache/dev-ros/tf2-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/ro
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ee65e82f814e05c778ece5a405155f6
diff --git a/metadata/md5-cache/dev-ros/tf2-9999 b/metadata/md5-cache/dev-ros/tf2-9999
index e3f68390fba1..425c279d727c 100644
--- a/metadata/md5-cache/dev-ros/tf2-9999
+++ b/metadata/md5-cache/dev-ros/tf2-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1ee65e82f814e05c778ece5a405155f6
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.5.12 b/metadata/md5-cache/dev-ros/tf2_bullet-0.5.12
index 2f63a8064368..f7e108beb893 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=TF2 bullet support
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_bullet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bulle
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=71931e953be2b109a2fcbbc62735a17d
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-0.5.13 b/metadata/md5-cache/dev-ros/tf2_bullet-0.5.13
index 88aa44f97758..7dcb642a370d 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=TF2 bullet support
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_bullet
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bulle
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=71931e953be2b109a2fcbbc62735a17d
diff --git a/metadata/md5-cache/dev-ros/tf2_bullet-9999 b/metadata/md5-cache/dev-ros/tf2_bullet-9999
index 1c2d522a583d..fd5bf9843f2c 100644
--- a/metadata/md5-cache/dev-ros/tf2_bullet-9999
+++ b/metadata/md5-cache/dev-ros/tf2_bullet-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=TF2 bullet support
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_bullet
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] sci-physics/bullet dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=71931e953be2b109a2fcbbc62735a17d
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-0.5.13 b/metadata/md5-cache/dev-ros/tf2_eigen-0.5.13
index e76e7f66d4e1..d69d62405462 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=TF2 eigen support
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_eigen
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] d
 SLOT=0
 SRC_URI=https://github.com/ros/geometry2/archive/0.5.13.tar.gz -> geometry2-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99a3ed4b9386fdf855f3af4ba8406c13
diff --git a/metadata/md5-cache/dev-ros/tf2_eigen-9999 b/metadata/md5-cache/dev-ros/tf2_eigen-9999
index 194c111fa5a1..e6c5136291c1 100644
--- a/metadata/md5-cache/dev-ros/tf2_eigen-9999
+++ b/metadata/md5-cache/dev-ros/tf2_eigen-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=TF2 eigen support
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_eigen
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=99a3ed4b9386fdf855f3af4ba8406c13
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.12 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.12
index 3e782385a9c3..d3254f5314dc 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_geometry_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc4298fc73673cea8590d90b6fa4f9eb
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.13 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.13
index 06bc33e3fc66..b044953fe0ba 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_geometry_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc4298fc73673cea8590d90b6fa4f9eb
diff --git a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
index 213080d1d24e..b77c12385539 100644
--- a/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_geometry_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=The second generation Transform Library in ROS
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_geometry_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 sci-libs/orocos_kdl dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=cc4298fc73673cea8590d90b6fa4f9eb
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.5.12 b/metadata/md5-cache/dev-ros/tf2_kdl-0.5.12
index 989aa3ac5243..274ce649197d 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=KDL binding for tf2
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_kdl
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c20cb723776cf2324073d9bcb8525a2e
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-0.5.13 b/metadata/md5-cache/dev-ros/tf2_kdl-0.5.13
index 1814803a302c..c41793e8b9e6 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=KDL binding for tf2
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_kdl
@@ -10,5 +10,5 @@ RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c20cb723776cf2324073d9bcb8525a2e
diff --git a/metadata/md5-cache/dev-ros/tf2_kdl-9999 b/metadata/md5-cache/dev-ros/tf2_kdl-9999
index 81c3913943ca..480768d39c8b 100644
--- a/metadata/md5-cache/dev-ros/tf2_kdl-9999
+++ b/metadata/md5-cache/dev-ros/tf2_kdl-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=KDL binding for tf2
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_kdl
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-cpp/eigen:3 dev-ros/tf2 dev-ros/tf2_ros dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-ros/tf2_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cmake_modules dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c20cb723776cf2324073d9bcb8525a2e
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.5.12 b/metadata/md5-cache/dev-ros/tf2_msgs-0.5.12
index b1e0653cd91d..a9b8e02bfa11 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=TF2 messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0e900a051aaabfbe32ebbbb0c8b5491
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-0.5.13 b/metadata/md5-cache/dev-ros/tf2_msgs-0.5.13
index 1e64834550c4..90f8d916ba3c 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=TF2 messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0e900a051aaabfbe32ebbbb0c8b5491
diff --git a/metadata/md5-cache/dev-ros/tf2_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_msgs-9999
index fcd01aaf8252..9baac972cb71 100644
--- a/metadata/md5-cache/dev-ros/tf2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=TF2 messages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d0e900a051aaabfbe32ebbbb0c8b5491
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.5.12 b/metadata/md5-cache/dev-ros/tf2_py-0.5.12
index 2c3401bff08b..a56517ce3528 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 python bindings
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_ta
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43805af0396c0c48b249cfd92f2b9df7
diff --git a/metadata/md5-cache/dev-ros/tf2_py-0.5.13 b/metadata/md5-cache/dev-ros/tf2_py-0.5.13
index 3d32c9c4c15d..77ba72f84aba 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_py-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 python bindings
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_py
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_ta
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43805af0396c0c48b249cfd92f2b9df7
diff --git a/metadata/md5-cache/dev-ros/tf2_py-9999 b/metadata/md5-cache/dev-ros/tf2_py-9999
index e6cd362c3be9..31ddc00bec74 100644
--- a/metadata/md5-cache/dev-ros/tf2_py-9999
+++ b/metadata/md5-cache/dev-ros/tf2_py-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 python bindings
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_py
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=43805af0396c0c48b249cfd92f2b9df7
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1 b/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1
index 27e4b95f3c73..53ae81efe23c 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_ros
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_pyt
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d2f535ea05b832f7a29579e8fba4393
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-9999 b/metadata/md5-cache/dev-ros/tf2_ros-9999
index 6a1f3a214ac2..5f6ea93921eb 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_ros
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5d2f535ea05b832f7a29579e8fba4393
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.12 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.12
index f93a854f29ea..cfadbca27f66 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_sensor_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c42d16020c4bb0581c5921c267a9a03
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.13 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.13
index a126b2b1197f..37c61001925e 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_sensor_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c42d16020c4bb0581c5921c267a9a03
diff --git a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999 b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
index f68ed0d8ae8e..38be8409fbbb 100644
--- a/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
+++ b/metadata/md5-cache/dev-ros/tf2_sensor_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Transform sensor_msgs with tf. Most notably, PointCloud2
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_sensor_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python_orocos_kdl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c42d16020c4bb0581c5921c267a9a03
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.5.12 b/metadata/md5-cache/dev-ros/tf2_tools-0.5.12
index cc691978524f..8c71f2d2860a 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.5.12
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.5.12
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74a788dd04ef3a41107b41c8922fc12
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-0.5.13 b/metadata/md5-cache/dev-ros/tf2_tools-0.5.13
index 55573b601ea0..1b19a4c671a1 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-0.5.13
+++ b/metadata/md5-cache/dev-ros/tf2_tools-0.5.13
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-py
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74a788dd04ef3a41107b41c8922fc12
diff --git a/metadata/md5-cache/dev-ros/tf2_tools-9999 b/metadata/md5-cache/dev-ros/tf2_tools-9999
index 31c755d233fb..2048ca221866 100644
--- a/metadata/md5-cache/dev-ros/tf2_tools-9999
+++ b/metadata/md5-cache/dev-ros/tf2_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=TF2 tools
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b74a788dd04ef3a41107b41c8922fc12
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.11.7 b/metadata/md5-cache/dev-ros/tf_conversions-1.11.7
index 42923d131c90..00ab9c7c9b15 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.11.7
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.11.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Conversion functions to convert common tf datatypes into identical datatypes used by other libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf_conversions
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.7.tar.gz -> geometry-1.11.7.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1337105df663bca20efe654fbd3768c1
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-1.11.8 b/metadata/md5-cache/dev-ros/tf_conversions-1.11.8
index c2f20c25704a..b2933c5a9b5e 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-1.11.8
+++ b/metadata/md5-cache/dev-ros/tf_conversions-1.11.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Conversion functions to convert common tf datatypes into identical datatypes used by other libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf_conversions
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_
 SLOT=0
 SRC_URI=https://github.com/ros/geometry/archive/1.11.8.tar.gz -> geometry-1.11.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1337105df663bca20efe654fbd3768c1
diff --git a/metadata/md5-cache/dev-ros/tf_conversions-9999 b/metadata/md5-cache/dev-ros/tf_conversions-9999
index 59a62f74395e..68715afb637a 100644
--- a/metadata/md5-cache/dev-ros/tf_conversions-9999
+++ b/metadata/md5-cache/dev-ros/tf_conversions-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Conversion functions to convert common tf datatypes into identical datatypes used by other libraries
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf_conversions
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/kdl_conversions dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/orocos_kdl dev-cpp/eigen:3 dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=1337105df663bca20efe654fbd3768c1
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.2 b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.2
index 413d6971baff..1bfd1488cf32 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.2
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport dev-ros/tf media-libs/opencv dev-ros/tf dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport dev-ros/tf media-libs/opencv dev-ros/tf dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Plugin to image_transport for transparently sending an image stream encoded with the Theora codec
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/theora_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport de
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.2.tar.gz -> image_transport_plugins-1.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=95a236bb57a245db889260c0e33216d2
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.3 b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.3
index 25124507f2ce..e351ddc6c425 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.3
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Plugin to image_transport for transparently sending an image stream encoded with the Theora codec
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/theora_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport me
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.3.tar.gz -> image_transport_plugins-1.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d1b640c36ea5954b18798592faa2323
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5 b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5
index b7062cb8402b..99390a147893 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-1.9.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Plugin to image_transport for transparently sending an image stream encoded with the Theora codec
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/theora_image_transport
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport me
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_transport_plugins/archive/1.9.5.tar.gz -> image_transport_plugins-1.9.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=41cf85b25da962b5ead7d3a415c9ec9a
diff --git a/metadata/md5-cache/dev-ros/theora_image_transport-9999 b/metadata/md5-cache/dev-ros/theora_image_transport-9999
index cf692be460a1..6226c3204f5f 100644
--- a/metadata/md5-cache/dev-ros/theora_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/theora_image_transport-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_transport media-libs/opencv dev-ros/rosbag dev-ros/pluginlib media-libs/libogg media-libs/libtheora[encode] virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Plugin to image_transport for transparently sending an image stream encoded with the Theora codec
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/theora_image_transport
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cv_bridge 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-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=6d1b640c36ea5954b18798592faa2323
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 3d4bf632c4f8..ce69249c8e54 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-1.6.8
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/timestamp_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslib dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=391882ad52e34666ce79a050ae826461
diff --git a/metadata/md5-cache/dev-ros/timestamp_tools-9999 b/metadata/md5-cache/dev-ros/timestamp_tools-9999
index 5644bdb1fc42..4c3f63e29695 100644
--- a/metadata/md5-cache/dev-ros/timestamp_tools-9999
+++ b/metadata/md5-cache/dev-ros/timestamp_tools-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roslib dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Classes to help timestamp hardware events
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/timestamp_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslib dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=391882ad52e34666ce79a050ae826461
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.11.14 b/metadata/md5-cache/dev-ros/topic_tools-1.11.14
index 9abe14178315..0bb6943111eb 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.11.14
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.11.14
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.11.15 b/metadata/md5-cache/dev-ros/topic_tools-1.11.15
index 60b9a3c3ed7d..e515a266c2ac 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.11.15
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.11.15
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.11.16 b/metadata/md5-cache/dev-ros/topic_tools-1.11.16
index 96a17f8f745d..65a4c1f9043b 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.11.16
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.11.16
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.11.17 b/metadata/md5-cache/dev-ros/topic_tools-1.11.17
index cb1fbb7d3cf4..16591f2e94cb 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.11.17
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.11.17
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.12.0 b/metadata/md5-cache/dev-ros/topic_tools-1.12.0
index 79c6570546e8..3c93d5359daf 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.12.0
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.12.0
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.12.1 b/metadata/md5-cache/dev-ros/topic_tools-1.12.1
index 5edee3557eec..5e58d7109830 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.12.1
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.12.1
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.12.2 b/metadata/md5-cache/dev-ros/topic_tools-1.12.2
index 367e661786c6..71d3f986f5e3 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.12.2
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.12.2
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4da854385a09c60e6e1779e8b1a30a61
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.12.4 b/metadata/md5-cache/dev-ros/topic_tools-1.12.4
index d47ffbac41ac..9e12930476a8 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.12.4
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.12.4
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4da854385a09c60e6e1779e8b1a30a61
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.12.5 b/metadata/md5-cache/dev-ros/topic_tools-1.12.5
index d4c0af12765a..0c20a0bc0715 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.12.5
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.12.5
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4da854385a09c60e6e1779e8b1a30a61
diff --git a/metadata/md5-cache/dev-ros/topic_tools-1.12.6 b/metadata/md5-cache/dev-ros/topic_tools-1.12.6
index 1885c67f795b..3f876578b904 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-1.12.6
+++ b/metadata/md5-cache/dev-ros/topic_tools-1.12.6
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4da854385a09c60e6e1779e8b1a30a61
diff --git a/metadata/md5-cache/dev-ros/topic_tools-9999 b/metadata/md5-cache/dev-ros/topic_tools-9999
index 580dcc1e441a..c1903e623b24 100644
--- a/metadata/md5-cache/dev-ros/topic_tools-9999
+++ b/metadata/md5-cache/dev-ros/topic_tools-9999
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosunit[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tools for directing, throttling and selecting ROS topics
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/topic_tools
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-ros/rosconsole dev-ros/roscpp dev-ros/rostime dev-ros/xmlrpcpp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9c9b2332e625bc3ee11a30dfed5012b5
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.3 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.3
index 952096c5659a..8851866cf981 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/trajectory_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c054afa05d24b47657bd1a78a5ac69ef
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.4 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.4
index 0235b403dff0..742b09e02f8a 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/trajectory_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c054afa05d24b47657bd1a78a5ac69ef
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5 b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
index 5847b973bed9..43c13b1483cf 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/trajectory_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c61c795d1c7bd88ce3479704da0ba0f5
diff --git a/metadata/md5-cache/dev-ros/trajectory_msgs-9999 b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
index af30610bb797..c477adebde5b 100644
--- a/metadata/md5-cache/dev-ros/trajectory_msgs-9999
+++ b/metadata/md5-cache/dev-ros/trajectory_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages for defining robot trajectories
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/trajectory_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=c054afa05d24b47657bd1a78a5ac69ef
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.10.0 b/metadata/md5-cache/dev-ros/transmission_interface-0.10.0
index 6baf58c48a3d..9457d854392c 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.10.0
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.10.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.0.tar.gz -> ros_control-0.10.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f306814741b7dc3cb737e871a344acc9
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.10.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.10.1
index d8f6374422b2..6dbfe93e9999 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.10.1
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.10.1.tar.gz -> ros_control-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f306814741b7dc3cb737e871a344acc9
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.11.0 b/metadata/md5-cache/dev-ros/transmission_interface-0.11.0
index 7984521e99c1..c9e68fc14672 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.11.0
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.0.tar.gz -> ros_control-0.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56d48b2a75b402a7806f99899ddabd3a
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.11.1 b/metadata/md5-cache/dev-ros/transmission_interface-0.11.1
index 11a59aa8ceab..135e67cb45f2 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.11.1
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56d48b2a75b402a7806f99899ddabd3a
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.11.2 b/metadata/md5-cache/dev-ros/transmission_interface-0.11.2
index 0f17c037ec67..fae80666ce2a 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.11.2
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.11.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.2.tar.gz -> ros_control-0.11.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56d48b2a75b402a7806f99899ddabd3a
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.11.3 b/metadata/md5-cache/dev-ros/transmission_interface-0.11.3
index 3b23dcee8c73..8509da435ede 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.11.3
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.11.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.3.tar.gz -> ros_control-0.11.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=56d48b2a75b402a7806f99899ddabd3a
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-0.9.3 b/metadata/md5-cache/dev-ros/transmission_interface-0.9.3
index 22cf435e440d..2d37d647baaf 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-0.9.3
+++ b/metadata/md5-cache/dev-ros/transmission_interface-0.9.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever
 SLOT=0
 SRC_URI=https://github.com/ros-controls/ros_control/archive/0.9.3.tar.gz -> ros_control-0.9.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f306814741b7dc3cb737e871a344acc9
diff --git a/metadata/md5-cache/dev-ros/transmission_interface-9999 b/metadata/md5-cache/dev-ros/transmission_interface-9999
index 2f7d3b7b0403..ed446b24d7b6 100644
--- a/metadata/md5-cache/dev-ros/transmission_interface-9999
+++ b/metadata/md5-cache/dev-ros/transmission_interface-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Transmission Interface
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/transmission_interface
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/hardware_interface dev-ros/pluginlib dev-ros/resource_retriever dev-ros/roscpp dev-libs/tinyxml dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f306814741b7dc3cb737e871a344acc9
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
index b2676708c465..c97857608cd9 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.10
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_actionlib
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.10.tar.gz -> common_tutorials-0.1.10.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=26d7206e1b50941864ce596c70267da6
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.8 b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.8
index c6ec7edf3961..b69cbcbb1c61 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.8
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-0.1.8
@@ -1,5 +1,5 @@
 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 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_actionlib
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconso
 SLOT=0
 SRC_URI=https://github.com/ros/common_tutorials/archive/0.1.8.tar.gz -> common_tutorials-0.1.8.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa11550d14237fce30797d5ba6013176
diff --git a/metadata/md5-cache/dev-ros/turtle_actionlib-9999 b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
index 68652d8d98b8..1c99df908a40 100644
--- a/metadata/md5-cache/dev-ros/turtle_actionlib-9999
+++ b/metadata/md5-cache/dev-ros/turtle_actionlib-9999
@@ -1,5 +1,5 @@
 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-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Demonstrates how to write an action server and client with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_actionlib
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/actionlib dev-ros/actionlib_msgs dev-ros/angles dev-ros/rosconsole dev-ros/roscpp dev-ros/turtlesim dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=aa11550d14237fce30797d5ba6013176
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2 b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
index 3eac55ec217e..7be1a1a775ab 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
+++ b/metadata/md5-cache/dev-ros/turtle_tf-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_tf
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37a4341671fd5737b159943cef70aa79
diff --git a/metadata/md5-cache/dev-ros/turtle_tf-9999 b/metadata/md5-cache/dev-ros/turtle_tf-9999
index 3cd33edeb915..aa78ec6ebcca 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Demonstrates how to write a tf broadcaster and listener with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_tf
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=37a4341671fd5737b159943cef70aa79
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2 b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
index b6dfca702d40..56920d5e51ef 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-0.2.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_tf2
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single
 SLOT=0
 SRC_URI=https://github.com/ros/geometry_tutorials/archive/0.2.2.tar.gz -> geometry_tutorials-0.2.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba1cc6d7d50290582c125c6754e0c865
diff --git a/metadata/md5-cache/dev-ros/turtle_tf2-9999 b/metadata/md5-cache/dev-ros/turtle_tf2-9999
index 8e0ae3b9c07c..0babe50b96e1 100644
--- a/metadata/md5-cache/dev-ros/turtle_tf2-9999
+++ b/metadata/md5-cache/dev-ros/turtle_tf2-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Demonstrates how to write a tf2 broadcaster and listener with the turtlesim
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtle_tf2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_ros[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/turtlesim[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ba1cc6d7d50290582c125c6754e0c865
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.6.1 b/metadata/md5-cache/dev-ros/turtlesim-0.6.1
index 93e37d5778c5..cab36617fdbb 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.6.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.6.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtlesim
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-libs/boost:=[threads] dev-ros/roscons
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.6.1.tar.gz -> ros_tutorials-0.6.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=79e50df2188c5401e0f92cb5f7441519
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.7.0 b/metadata/md5-cache/dev-ros/turtlesim-0.7.0
index ab30c7bc4c71..db6e66ed6c2f 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.7.0
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.7.0
@@ -1,5 +1,5 @@
 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtlesim
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threa
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.0.tar.gz -> ros_tutorials-0.7.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f25b547aeddbc42469861522ff2fda7a
diff --git a/metadata/md5-cache/dev-ros/turtlesim-0.7.1 b/metadata/md5-cache/dev-ros/turtlesim-0.7.1
index 61279e6a2528..8959ff572225 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-0.7.1
+++ b/metadata/md5-cache/dev-ros/turtlesim-0.7.1
@@ -1,5 +1,5 @@
 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(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+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(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtlesim
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:=[threa
 SLOT=0
 SRC_URI=https://github.com/ros/ros_tutorials/archive/0.7.1.tar.gz -> ros_tutorials-0.7.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee10895b3876b2d849ee84c7623fdaaa
diff --git a/metadata/md5-cache/dev-ros/turtlesim-9999 b/metadata/md5-cache/dev-ros/turtlesim-9999
index e5256cbbb386..125875a38b2f 100644
--- a/metadata/md5-cache/dev-ros/turtlesim-9999
+++ b/metadata/md5-cache/dev-ros/turtlesim-9999
@@ -1,5 +1,5 @@
 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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+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(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Tool made for teaching ROS and ROS packages
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/turtlesim
@@ -8,5 +8,5 @@ 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 dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f25b547aeddbc42469861522ff2fda7a
diff --git a/metadata/md5-cache/dev-ros/unique_id-1.0.5 b/metadata/md5-cache/dev-ros/unique_id-1.0.5
index 01b499bbedfa..f393d3e0f904 100644
--- a/metadata/md5-cache/dev-ros/unique_id-1.0.5
+++ b/metadata/md5-cache/dev-ros/unique_id-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS Python and C++ interfaces for universally unique identifiers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/unique_id
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targ
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.5.tar.gz -> unique_identifier-1.0.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=947ab9915e0183455e962e9a503cd92c
diff --git a/metadata/md5-cache/dev-ros/unique_id-9999 b/metadata/md5-cache/dev-ros/unique_id-9999
index 0384d3b81280..fa9483e47d5d 100644
--- a/metadata/md5-cache/dev-ros/unique_id-9999
+++ b/metadata/md5-cache/dev-ros/unique_id-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp test? ( dev-cpp/gtest dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS Python and C++ interfaces for universally unique identifiers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/unique_id
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/uuid_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=947ab9915e0183455e962e9a503cd92c
diff --git a/metadata/md5-cache/dev-ros/urdf-1.12.3-r1 b/metadata/md5-cache/dev-ros/urdf-1.12.3-r1
index 4b5401c25278..660fd1dc51f5 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.12.3-r1
+++ b/metadata/md5-cache/dev-ros/urdf-1.12.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c949fcde39b63086172b219dfa051e9
diff --git a/metadata/md5-cache/dev-ros/urdf-1.12.4 b/metadata/md5-cache/dev-ros/urdf-1.12.4
index 8e243e17b746..f7a5d2dc7dd1 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.12.4
+++ b/metadata/md5-cache/dev-ros/urdf-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=4c949fcde39b63086172b219dfa051e9
diff --git a/metadata/md5-cache/dev-ros/urdf-1.12.5 b/metadata/md5-cache/dev-ros/urdf-1.12.5
index 95cfbb695c76..9b0f68bbc292 100644
--- a/metadata/md5-cache/dev-ros/urdf-1.12.5
+++ b/metadata/md5-cache/dev-ros/urdf-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers >=dev-ros/urdf_parser_plugin-1.12.3-r1 dev-ros/pluginlib dev-ros/rosconsole_bridge dev-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] >=dev-libs/urdfdom-1 dev-libs/urdfdom_headers
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=89d9bd49d4ba7c56f1d8f20c56feacf2
diff --git a/metadata/md5-cache/dev-ros/urdf-9999 b/metadata/md5-cache/dev-ros/urdf-9999
index 499060d919ca..5b7f145249ba 100644
--- a/metadata/md5-cache/dev-ros/urdf-9999
+++ b/metadata/md5-cache/dev-ros/urdf-9999
@@ -1,5 +1,5 @@
 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-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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-ros/roscpp dev-libs/tinyxml dev-ros/cmake_modules test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=C++ parser for the Unified Robot Description Format (URDF)
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf
@@ -8,5 +8,5 @@ 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-ros/roscpp dev-libs/tinyxml dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=7ea2bbc449ea3bc263ee13b3df4c86ff
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.3-r1 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.3-r1
index 21f4100a277c..869c381d5f2e 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.3-r1
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.3-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom_headers-1.0 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-libs/urdfdom_headers-1.0 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf_parser_plugin
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/urdfdom_headers-1.0 dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.3.tar.gz -> robot_model-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3442bfefb7e7988bad337a2cec1ac388
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.4-r1 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.4-r1
index b573d1e7de13..9ddf3bc061b2 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.4-r1
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.4-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom_headers-1.0 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-libs/urdfdom_headers-1.0 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf_parser_plugin
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/urdfdom_headers-1.0 dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.4.tar.gz -> robot_model-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3442bfefb7e7988bad337a2cec1ac388
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.5 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.5
index 91747ebcfe58..0cc735e23c28 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.5
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/urdfdom_headers-1.0 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-libs/urdfdom_headers-1.0 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf_parser_plugin
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/urdfdom_headers-1.0 dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/robot_model/archive/1.12.5.tar.gz -> robot_model-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=3442bfefb7e7988bad337a2cec1ac388
diff --git a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999 b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
index 6678c34a9a9e..81546c25a618 100644
--- a/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
+++ b/metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/urdfdom_headers >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-libs/urdfdom_headers >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ base class for URDF parsers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf_parser_plugin
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/urdfdom_headers dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=b4b444d8b05192159e02fb4d83aa939a
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-0.2.4 b/metadata/md5-cache/dev-ros/urdf_tutorial-0.2.4
index 3ee76d527bbf..1ebbbdc77c6d 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-0.2.4
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-0.2.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/pr2_description dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/pr2_description dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=URDF tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf_tutorial
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/pr2_description dev-r
 SLOT=0
 SRC_URI=https://github.com/ros/urdf_tutorial/archive/0.2.4.tar.gz -> urdf_tutorial-0.2.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=71eeb047ff4501356e1f4d994abb785e
diff --git a/metadata/md5-cache/dev-ros/urdf_tutorial-9999 b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
index 2f44e95a842d..e4f99c2e3b79 100644
--- a/metadata/md5-cache/dev-ros/urdf_tutorial-9999
+++ b/metadata/md5-cache/dev-ros/urdf_tutorial-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/pr2_description dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/pr2_description dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=URDF tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urdf_tutorial
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/urdf dev-ros/joint_state_publisher dev-ros/pr2_description dev-ros/robot_state_publisher dev-ros/rviz dev-ros/xacro dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=71eeb047ff4501356e1f4d994abb785e
diff --git a/metadata/md5-cache/dev-ros/urg_c-1.0.404 b/metadata/md5-cache/dev-ros/urg_c-1.0.404
index db715b9308a6..7d98641b85a7 100644
--- a/metadata/md5-cache/dev-ros/urg_c-1.0.404
+++ b/metadata/md5-cache/dev-ros/urg_c-1.0.404
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=URG Helper / URG Widget / URG Library / urg_c
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urg_c
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_c/archive/1.0.404.tar.gz -> urg_c-1.0.404.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=333107dc331e0aa41b70e36004735eff
diff --git a/metadata/md5-cache/dev-ros/urg_c-9999 b/metadata/md5-cache/dev-ros/urg_c-9999
index 370267d10b6f..a163a37e51a7 100644
--- a/metadata/md5-cache/dev-ros/urg_c-9999
+++ b/metadata/md5-cache/dev-ros/urg_c-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=URG Helper / URG Widget / URG Library / urg_c
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urg_c
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=333107dc331e0aa41b70e36004735eff
diff --git a/metadata/md5-cache/dev-ros/urg_node-0.1.9 b/metadata/md5-cache/dev-ros/urg_node-0.1.9
index 07045ea100b7..688873817cbd 100644
--- a/metadata/md5-cache/dev-ros/urg_node-0.1.9
+++ b/metadata/md5-cache/dev-ros/urg_node-0.1.9
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urg_node
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_pyth
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/urg_node/archive/0.1.9.tar.gz -> urg_node-0.1.9.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc10181713590d57d8c0cf5b7e644ee2
diff --git a/metadata/md5-cache/dev-ros/urg_node-9999 b/metadata/md5-cache/dev-ros/urg_node-9999
index a6c9591821a5..2aaa15b0b661 100644
--- a/metadata/md5-cache/dev-ros/urg_node-9999
+++ b/metadata/md5-cache/dev-ros/urg_node-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS wrapper for the Hokuyo urg_c library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/urg_node
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/urg_c dev-ros/tf dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nodelet dev-ros/rosconsole dev-ros/roscpp dev-ros/diagnostic_updater dev-ros/laser_proc dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=bc10181713590d57d8c0cf5b7e644ee2
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.5 b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.5
index 754a8f82fa7c..57e434ff2cef 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-1.0.5
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-1.0.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/uuid_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros-geographic-info/unique_identifier/archive/unique_identifier-1.0.5.tar.gz -> unique_identifier-1.0.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b39e548d9b623f63836e76f8cab21f9
diff --git a/metadata/md5-cache/dev-ros/uuid_msgs-9999 b/metadata/md5-cache/dev-ros/uuid_msgs-9999
index 68b87b7db2ea..937bc73c834d 100644
--- a/metadata/md5-cache/dev-ros/uuid_msgs-9999
+++ b/metadata/md5-cache/dev-ros/uuid_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=ROS messages for universally unique identifiers
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/uuid_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b39e548d9b623f63836e76f8cab21f9
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
index cb93ace5fd1d..f9fd9a128c0e 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_auto_tracker
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-r
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96fbe9df993db595dc20983349530d60
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1 b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
index eb1d0c7bd16d..55456ee97442 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_auto_tracker
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-r
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96fbe9df993db595dc20983349530d60
diff --git a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999 b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
index 4b401304ae7e..4e0601fec98d 100644
--- a/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_auto_tracker-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Online automated pattern-based object tracker relying on visual servoing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_auto_tracker
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:=[dmtx,zbar] dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=96fbe9df993db595dc20983349530d60
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.8.0 b/metadata/md5-cache/dev-ros/visp_bridge-0.8.0
index e03c8386ed68..63653be31878 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.8.0
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_bridge
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b88dd1f6c659d1adb7982cb44bfe786
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-0.9.1 b/metadata/md5-cache/dev-ros/visp_bridge-0.9.1
index ea88ad6e5919..f9cd02ecb81c 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-0.9.1
+++ b/metadata/md5-cache/dev-ros/visp_bridge-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_bridge
@@ -10,5 +10,5 @@ RDEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b88dd1f6c659d1adb7982cb44bfe786
diff --git a/metadata/md5-cache/dev-ros/visp_bridge-9999 b/metadata/md5-cache/dev-ros/visp_bridge-9999
index 5b00d0099ae3..2a98a81d578e 100644
--- a/metadata/md5-cache/dev-ros/visp_bridge-9999
+++ b/metadata/md5-cache/dev-ros/visp_bridge-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Converts between ROS structures and ViSP structures
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_bridge
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=sci-libs/ViSP:=[xml] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/camera_calibration_parsers dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5b88dd1f6c659d1adb7982cb44bfe786
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.8.0 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.8.0
index 87ebfece7ac2..89dabf694d4b 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.8.0
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.8.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cx
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d57718259b780a00e569d20aeba81c35
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.9.1 b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.9.1
index 72e85ab56542..0576484b5806 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-0.9.1
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-0.9.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_camera_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cx
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d57718259b780a00e569d20aeba81c35
diff --git a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999 b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
index 3151033bc205..db51c5d34733 100644
--- a/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_camera_calibration-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Calibration of cameras using a customizable pattern and ViSP library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_camera_calibration
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-ros/camera_calibration_parsers dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/visp_bridge sci-libs/ViSP:= dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=d57718259b780a00e569d20aeba81c35
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.8.0 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.8.0
index 2a584bc872f6..3ac8c05357d7 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.8.0
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.8.0
@@ -1,5 +1,5 @@
 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:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Estimates the camera position with respect to its effector using the ViSP library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_hand2eye_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridg
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d5b9ac4713d6c4ba2138a551987ba9d
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.9.1 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.9.1
index ec97166589f8..1f52334e65ea 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.9.1
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.9.1
@@ -1,5 +1,5 @@
 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:= sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Estimates the camera position with respect to its effector using the ViSP library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_hand2eye_calibration
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridg
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d5b9ac4713d6c4ba2138a551987ba9d
diff --git a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999 b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
index abfbe3160bab..69ad8b59321e 100644
--- a/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
+++ b/metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
@@ -1,5 +1,5 @@
 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:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
+DEPEND=dev-ros/image_proc dev-ros/roscpp dev-ros/sensor_msgs dev-ros/visp_bridge dev-ros/visp_tracker sci-libs/ViSP:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 DESCRIPTION=Estimates the camera position with respect to its effector using the ViSP library
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_hand2eye_calibration
@@ -8,5 +8,5 @@ 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:= dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=9d5b9ac4713d6c4ba2138a551987ba9d
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.8.0 b/metadata/md5-cache/dev-ros/visp_tracker-0.8.0
index 98ec498e83ac..e81b6a89ca83 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.8.0
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.8.0
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_tracker
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_m
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.8.0.tar.gz -> vision_visp-0.8.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=107780d64e520e11e02a2c49a0786765
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.9.1 b/metadata/md5-cache/dev-ros/visp_tracker-0.9.1
index c1cfdd9ebb24..48e1b0bf3a11 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.9.1
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.9.1
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_tracker
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_m
 SLOT=0
 SRC_URI=https://github.com/lagadic/vision_visp/archive/jade-0.9.1.tar.gz -> vision_visp-0.9.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0e415da4fce8aa9408f472d438e5c6f
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index 518953bcbe51..28010ac0daea 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -1,5 +1,5 @@
 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_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_tracker
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_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_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=f0e415da4fce8aa9408f472d438e5c6f
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1
index 026634cd637e..f7db7bfd229e 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.10.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Visualization marker tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_marker_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.10.1.tar.gz -> visualization_tutorials-0.10.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53263d9d1d30eb36b55d4f4fb0bc0ca9
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2
index 1d801d2d85d5..0c07aeb5404a 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-0.9.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Visualization marker tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_marker_tutorials
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/
 SLOT=0
 SRC_URI=https://github.com/ros-visualization/visualization_tutorials/archive/0.9.2.tar.gz -> visualization_tutorials-0.9.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53263d9d1d30eb36b55d4f4fb0bc0ca9
diff --git a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999 b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
index 8171122e515f..787067f6cab1 100644
--- a/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
+++ b/metadata/md5-cache/dev-ros/visualization_marker_tutorials-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Visualization marker tutorials
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_marker_tutorials
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=53263d9d1d30eb36b55d4f4fb0bc0ca9
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.3 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.3
index f3801780ec5c..a3251a98838e 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.3
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.3
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.3.tar.gz -> common_msgs-1.12.3.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fa2cc1ea4e8f4cb2593a912e0e05a00
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.4 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.4
index f67b4ad4fbcb..d24a57723b0c 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.4.tar.gz -> common_msgs-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fa2cc1ea4e8f4cb2593a912e0e05a00
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5 b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
index 529e0254d362..fe265dc8e792 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_msgs
@@ -10,5 +10,5 @@ RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)
 SLOT=0
 SRC_URI=https://github.com/ros/common_msgs/archive/1.12.5.tar.gz -> common_msgs-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=fd8aac111dbf902694f7b2e95558d681
diff --git a/metadata/md5-cache/dev-ros/visualization_msgs-9999 b/metadata/md5-cache/dev-ros/visualization_msgs-9999
index f48d50c75ba3..67b20d96b0fd 100644
--- a/metadata/md5-cache/dev-ros/visualization_msgs-9999
+++ b/metadata/md5-cache/dev-ros/visualization_msgs-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=Messages used by higher level packages that deal in visualization-specific data.
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visualization_msgs
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-util/catkin[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/empy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) dev-ros/geometry_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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=5fa2cc1ea4e8f4cb2593a912e0e05a00
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.13.0 b/metadata/md5-cache/dev-ros/voxel_grid-1.13.0
index 21507797ce2c..e6f9f1a522de 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.13.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.13.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/voxel_grid
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a52fcc47618630724d6dc0275eea9fc8
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.13.1 b/metadata/md5-cache/dev-ros/voxel_grid-1.13.1
index 27b74c25ac04..98c691571a09 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.13.1
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.13.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/voxel_grid
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a52fcc47618630724d6dc0275eea9fc8
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-1.14.0 b/metadata/md5-cache/dev-ros/voxel_grid-1.14.0
index 7f10cd0f169a..35b088b79041 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-1.14.0
+++ b/metadata/md5-cache/dev-ros/voxel_grid-1.14.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/voxel_grid
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=e74f5d413302ee9d945a74fb1f126a63
diff --git a/metadata/md5-cache/dev-ros/voxel_grid-9999 b/metadata/md5-cache/dev-ros/voxel_grid-9999
index 336b29ea66a5..8bf15e82334b 100644
--- a/metadata/md5-cache/dev-ros/voxel_grid-9999
+++ b/metadata/md5-cache/dev-ros/voxel_grid-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=Implementation of an efficient 3D voxel grid
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/voxel_grid
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roscpp dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a52fcc47618630724d6dc0275eea9fc8
diff --git a/metadata/md5-cache/dev-ros/xacro-1.11.0 b/metadata/md5-cache/dev-ros/xacro-1.11.0
index fcc2b5b49092..e2becc9af704 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.11.0
+++ b/metadata/md5-cache/dev-ros/xacro-1.11.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=XML macro language
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xacro
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.11.0.tar.gz -> xacro-1.11.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=639d98f0aacd9633f3de6a8eaa94cae3
diff --git a/metadata/md5-cache/dev-ros/xacro-1.11.1 b/metadata/md5-cache/dev-ros/xacro-1.11.1
index a91565ee6b59..496d7fedd48d 100644
--- a/metadata/md5-cache/dev-ros/xacro-1.11.1
+++ b/metadata/md5-cache/dev-ros/xacro-1.11.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=XML macro language
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xacro
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_pytho
 SLOT=0
 SRC_URI=https://github.com/ros/xacro/archive/1.11.1.tar.gz -> xacro-1.11.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=74a2a3ce7c6cc8c6bd1b6fa70c65daf4
diff --git a/metadata/md5-cache/dev-ros/xacro-9999 b/metadata/md5-cache/dev-ros/xacro-9999
index 4a515272a569..411d8976db4c 100644
--- a/metadata/md5-cache/dev-ros/xacro-9999
+++ b/metadata/md5-cache/dev-ros/xacro-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=XML macro language
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xacro
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/roslint[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslaunch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	dcd61d7a5c283f18cfe763552b09eb88	python-utils-r1	d142329ab093dd20c1dd0edb5f094108	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=639d98f0aacd9633f3de6a8eaa94cae3
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.14 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.14
index 6bd2fb96ea35..4b5c789a7aad 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.14
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.14
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.14.tar.gz -> ros_comm-1.11.14.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:ros-catkin src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=ee51f52763c9578aa7831a36785fefde
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.15-r1 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.15-r1
index 725506d710f5..b12b55ae3a27 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.15-r1
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.15-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.15.tar.gz -> ros_comm-1.11.15.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=47166c969c8bccc5bc1594a4d11d0bdd
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.16-r1 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.16-r1
index 5416ebd2ee21..b42d38ca7c2a 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.16-r1
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.16-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.16.tar.gz -> ros_comm-1.11.16.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58e98dc7663efab3b0098ade60381171
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.17 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.17
index ef27d19374a2..c266daa00c26 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.17
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.11.17
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.11.17.tar.gz -> ros_comm-1.11.17.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58e98dc7663efab3b0098ade60381171
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.0 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.0
index b97ac95882a0..cf16058ace83 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.0
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.0.tar.gz -> ros_comm-1.12.0.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58e98dc7663efab3b0098ade60381171
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.1 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.1
index 35a8935e7540..1cc2b4d2f079 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.1
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.1.tar.gz -> ros_comm-1.12.1.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58e98dc7663efab3b0098ade60381171
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.2 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.2
index c1c61238171b..623cb022084e 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.2
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.2.tar.gz -> ros_comm-1.12.2.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2ef144853c40e2eed622fbf272fd269
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.4 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.4
index 73c00bf9aac2..54ac9e4f6088 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.4
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.4.tar.gz -> ros_comm-1.12.4.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2ef144853c40e2eed622fbf272fd269
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.5 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.5
index 73a00bd77d3d..83cbc8d85894 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.5
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.5
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.5.tar.gz -> ros_comm-1.12.5.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2ef144853c40e2eed622fbf272fd269
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.6 b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.6
index e4a4910dadfa..931b892a8822 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.6
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-1.12.6
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -10,5 +10,5 @@ RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros/ros_comm/archive/1.12.6.tar.gz -> ros_comm-1.12.6.tar.gz
 _eclass_exported_funcs=src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=a2ef144853c40e2eed622fbf272fd269
diff --git a/metadata/md5-cache/dev-ros/xmlrpcpp-9999 b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
index d0304fff11e4..85dd6366f92b 100644
--- a/metadata/md5-cache/dev-ros/xmlrpcpp-9999
+++ b/metadata/md5-cache/dev-ros/xmlrpcpp-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cpp_common >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.2.2 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/cpp_common >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.5.2 dev-util/catkin dev-python/empy
 DESCRIPTION=C++ implementation of the XML-RPC protocol
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/xmlrpcpp
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=dev-ros/cpp_common dev-util/catkin dev-python/empy
 SLOT=0
 _eclass_exported_funcs=src_unpack:git-r3 src_prepare:ros-catkin src_configure:- src_compile:ros-catkin src_test:ros-catkin src_install:ros-catkin
-_eclasses_=cmake-utils	841d8d6fc58d18f89ca4920900fd8d2a	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_eclasses_=cmake-utils	b43f5e0df58483dd4b68aef4777f6e22	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	7366202dd55cb8f018f5d450d54e7749	git-r3	e928b84a9f6f1d9076d1d27687876dc6	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	1b1da0c45c555989dc5d832b54880783	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
 _md5_=58e98dc7663efab3b0098ade60381171