2017-04-17 09:42:24 UTC

27 files changed, 71 insertions, 189 deletions

diff --git a/metadata/md5-cache/app-text/jist-1.5.1-r1 b/metadata/md5-cache/app-text/jist-1.5.1-r1
index a1f5030fb4b8..8e6a104ee78d 100644
--- a/metadata/md5-cache/app-text/jist-1.5.1-r1
+++ b/metadata/md5-cache/app-text/jist-1.5.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=A ruby gem to publish a gist
 EAPI=5
 HOMEPAGE=https://github.com/ConradIrwin/jist
 IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby21? ( dev-ruby/json:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/json:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
 REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
@@ -12,4 +12,4 @@ SLOT=0
 SRC_URI=mirror://rubygems/jist-1.5.1.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c051c513404bf31173e4b7c534183e54
+_md5_=1d473228d53b27ff2017dad2009f6690
diff --git a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0 b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r1
index 98bfd6598170..98bfd6598170 100644
--- a/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0
+++ b/metadata/md5-cache/dev-ml/ppx_optcomp-0.9.0-r1
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
deleted file mode 100644
index 114b08285844..000000000000
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-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/tf 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
-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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=93d8ce0ee88c62ea7cacee556b4e3959
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
deleted file mode 100644
index 4d3d4fb022b7..000000000000
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-1.9.3
+++ /dev/null
@@ -1,14 +0,0 @@
-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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-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
-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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b5c499c5fd8648ea882f807e72314d74
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 23d330682787..ec18513e52e0 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,14 +1,14 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 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(-)]
+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
 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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=616ecd3b9f01991ed2a18c7535817743
+_md5_=5d8dfcc43f7ff494c25f32384aef693f
diff --git a/metadata/md5-cache/dev-ros/compressed_image_transport-9999 b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
index f79c6e7bda81..038e76594916 100644
--- a/metadata/md5-cache/dev-ros/compressed_image_transport-9999
+++ b/metadata/md5-cache/dev-ros/compressed_image_transport-9999
@@ -1,12 +1,12 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 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(-)]
+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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b5c499c5fd8648ea882f807e72314d74
+_md5_=5d8dfcc43f7ff494c25f32384aef693f
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.4 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.4
deleted file mode 100644
index 03dbb7796e1a..000000000000
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.12.4
+++ /dev/null
@@ -1,14 +0,0 @@
-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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-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
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5608212de3bf8f406034f79866e68753
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.12.4-r1 b/metadata/md5-cache/dev-ros/cv_bridge-1.12.4-r1
new file mode 100644
index 000000000000..a6c1a563fe2b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.12.4-r1
@@ -0,0 +1,14 @@
+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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+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
+SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=b7013f5b50f29714d46ff3c7221fdfde
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index ba74455b7852..39a3d79242e4 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -1,12 +1,12 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 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(-)]
+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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=e380217bf19b26fdcde23fce0bb30b1e
+_md5_=b7013f5b50f29714d46ff3c7221fdfde
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 205bd9b88ffc..e29b0d690669 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-1.12.19
+++ b/metadata/md5-cache/dev-ros/image_publisher-1.12.19
@@ -1,14 +1,14 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/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 media-libs/opencv:= 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 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(-)]
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-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
 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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=723fd7dd999a423cabdd4ea773da0568
+_md5_=88710d1f2b65a8467a13c56da324c1b1
diff --git a/metadata/md5-cache/dev-ros/image_publisher-9999 b/metadata/md5-cache/dev-ros/image_publisher-9999
index 22142bbf8501..3ef6d6395943 100644
--- a/metadata/md5-cache/dev-ros/image_publisher-9999
+++ b/metadata/md5-cache/dev-ros/image_publisher-9999
@@ -1,12 +1,12 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/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 media-libs/opencv:= 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 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(-)]
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/dynamic_reconfigure dev-ros/camera_info_manager dev-ros/image_transport dev-ros/nodelet dev-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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ae52ef960cf929814fc7189fc440f77d
+_md5_=cb21b47a26f678bbde66a21e80032968
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 dbbab4bb6503..78843718fdb2 100644
--- a/metadata/md5-cache/dev-ros/image_view-1.12.19
+++ b/metadata/md5-cache/dev-ros/image_view-1.12.19
@@ -1,14 +1,14 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/opencv x11-libs/gtk+:2 dev-ros/camera_calibration_parsers >=dev-ros/cv_bridge-1.11.10 dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/rosconsole dev-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(-)]
+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
 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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5e5f6e804f2d87b1bda2d83ced0a7e51
+_md5_=ea1b0cdc2f9cc7cf2d8d3cac9a1b2b48
diff --git a/metadata/md5-cache/dev-ros/image_view-9999 b/metadata/md5-cache/dev-ros/image_view-9999
index 1c7362bcf4f1..574dad59173d 100644
--- a/metadata/md5-cache/dev-ros/image_view-9999
+++ b/metadata/md5-cache/dev-ros/image_view-9999
@@ -1,12 +1,12 @@
 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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-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.7.2 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=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
 IUSE=python_targets_python2_7 test
 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(-)]
+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	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	git-r3	cbafa3261c37c7e3af44bb16a34ea390	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	0c067f080a047742ffac024b16895b45	python-utils-r1	a166d0f5815d7f1e67bb60a196f1bf7e	ros-catkin	6e65d6f3b4334bec18a622e7dbbf80a1	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1bfee48c2fe982dd27484e7dea6474f4
+_md5_=397fb3dbf2f94ed209ff5a69d60769cc
diff --git a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4 b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
index f97d5c926fb0..a9a7790a261d 100644
--- a/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
+++ b/metadata/md5-cache/dev-ruby/activerecord-deprecated_finders-1.0.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/bundler[ruby_targets_ruby20] =dev-ruby/activerecord-4*[ruby_targets_ruby20] >=dev-ruby/minitest-3[ruby_targets_ruby20] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/activerecord-4*[ruby_targets_ruby21] >=dev-ruby/minitest-3[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/bundler[ruby_targets_ruby21] =dev-ruby/activerecord-4*[ruby_targets_ruby21] >=dev-ruby/minitest-3[ruby_targets_ruby21] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] =dev-ruby/activerecord-4*[ruby_targets_ruby22] >=dev-ruby/minitest-3[ruby_targets_ruby22] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] =dev-ruby/activerecord-4*[ruby_targets_ruby23] >=dev-ruby/minitest-3[ruby_targets_ruby23] >=dev-ruby/sqlite3-1.3[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Used to extract and deprecate old-style finder option hashes in Active Record
 EAPI=5
 HOMEPAGE=https://github.com/rails
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 test test
 KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=1.0
 SRC_URI=https://github.com/rails/activerecord-deprecated_finders/archive/v1.0.4.tar.gz -> activerecord-deprecated_finders-1.0.4.tar.gz
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f2a1b0d205c2cb32aa8bb58d778bd46d
+_md5_=b8d5f0a28550ee911bb18b80dbee3b5e
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.3 b/metadata/md5-cache/dev-ruby/ammeter-1.1.3
deleted file mode 100644
index 61eaf8a7d920..000000000000
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby20] >=dev-ruby/uglifier-1.3[ruby_targets_ruby20] >=dev-ruby/rake-0.10[ruby_targets_ruby20] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby20] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby20] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby20] dev-util/cucumber[ruby_targets_ruby20] dev-util/aruba[ruby_targets_ruby20] dev-ruby/sqlite3[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.10[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby21] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=Write specs for your Rails 3+ generators
-EAPI=5
-HOMEPAGE=https://github.com/alexrothenberg/ammeter
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/ammeter-1.1.3.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5387c7871c025c2e020ba9cec29d194f
diff --git a/metadata/md5-cache/dev-ruby/ammeter-1.1.3-r1 b/metadata/md5-cache/dev-ruby/ammeter-1.1.3-r1
deleted file mode 100644
index 0d221dc5aa8e..000000000000
--- a/metadata/md5-cache/dev-ruby/ammeter-1.1.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby20] >=dev-ruby/uglifier-1.3[ruby_targets_ruby20] >=dev-ruby/rake-0.10[ruby_targets_ruby20] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby20] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby20] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby20] dev-util/cucumber[ruby_targets_ruby20] dev-util/aruba[ruby_targets_ruby20] dev-ruby/sqlite3[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby21] >=dev-ruby/uglifier-1.3[ruby_targets_ruby21] >=dev-ruby/rake-0.10[ruby_targets_ruby21] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby21] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby21] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby21] dev-util/cucumber[ruby_targets_ruby21] dev-util/aruba[ruby_targets_ruby21] dev-ruby/sqlite3[ruby_targets_ruby21] dev-ruby/bundler[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rails-4.0[ruby_targets_ruby22] >=dev-ruby/uglifier-1.3[ruby_targets_ruby22] >=dev-ruby/rake-0.10[ruby_targets_ruby22] >=dev-ruby/coffee-rails-4.0[ruby_targets_ruby22] >=dev-ruby/sass-rails-4.0[ruby_targets_ruby22] >=dev-ruby/jquery-rails-3.0[ruby_targets_ruby22] dev-util/cucumber[ruby_targets_ruby22] dev-util/aruba[ruby_targets_ruby22] dev-ruby/sqlite3[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
-DESCRIPTION=Write specs for your Rails 3+ generators
-EAPI=5
-HOMEPAGE=https://github.com/alexrothenberg/ammeter
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby22] >=dev-ruby/railties-3.0:*[ruby_targets_ruby22] >=dev-ruby/rspec-rails-2.2:*[ruby_targets_ruby22] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=mirror://rubygems/ammeter-1.1.3.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=88a1482c94cc783650d681fd7d08d249
diff --git a/metadata/md5-cache/dev-ruby/atomic-1.1.16 b/metadata/md5-cache/dev-ruby/atomic-1.1.16
deleted file mode 100644
index 852491ddd88a..000000000000
--- a/metadata/md5-cache/dev-ruby/atomic-1.1.16
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=An atomic reference implementation for JRuby, Rubinius, and MRI
-EAPI=5
-HOMEPAGE=https://github.com/headius/ruby-atomic
-IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=0
-SRC_URI=mirror://rubygems/atomic-1.1.16.gem
-_eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=14e87ab0965f33b4075c2597e226ba16
diff --git a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3 b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
index 70708b2caac3..7e73ddcc481f 100644
--- a/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
+++ b/metadata/md5-cache/dev-ruby/aws-s3-0.6.3
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/xml-simple[ruby_targets_ruby20] dev-ruby/builder[ruby_targets_ruby20] dev-ruby/mime-types[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/flexmock[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/flexmock[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/flexmock[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/flexmock[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
 DESCRIPTION=Client library for Amazon's Simple Storage Service's REST API
 EAPI=5
 HOMEPAGE=http://amazon.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 doc test test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( dev-ruby/xml-simple[ruby_targets_ruby20] dev-ruby/builder[ruby_targets_ruby20] dev-ruby/mime-types[ruby_targets_ruby20] virtual/ruby-ssl[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby21? ( dev-ruby/xml-simple[ruby_targets_ruby21] dev-ruby/builder[ruby_targets_ruby21] dev-ruby/mime-types[ruby_targets_ruby21] virtual/ruby-ssl[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/xml-simple[ruby_targets_ruby22] dev-ruby/builder[ruby_targets_ruby22] dev-ruby/mime-types[ruby_targets_ruby22] virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/xml-simple[ruby_targets_ruby23] dev-ruby/builder[ruby_targets_ruby23] dev-ruby/mime-types[ruby_targets_ruby23] virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 )
 SLOT=0
 SRC_URI=mirror://rubygems/aws-s3-0.6.3.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=99cdff95291552425f104912467c3dd8
+_md5_=463ca57d377c90b9d768a4c51bba0876
diff --git a/metadata/md5-cache/dev-ruby/camping-2.1.532 b/metadata/md5-cache/dev-ruby/camping-2.1.532
index 52b76a272325..b6f29fc3df69 100644
--- a/metadata/md5-cache/dev-ruby/camping-2.1.532
+++ b/metadata/md5-cache/dev-ruby/camping-2.1.532
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby20? ( test? ( dev-ruby/rack-test[ruby_targets_ruby20] >=dev-ruby/minitest-4:0[ruby_targets_ruby20] dev-ruby/tilt:0[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/tilt:0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby20] >=dev-ruby/rack-1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=ruby_targets_ruby21? ( test? ( dev-ruby/rack-test[ruby_targets_ruby21] >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/tilt:0[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( test? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
 DESCRIPTION=A small web framework modeled after Ruby on Rails
 EAPI=5
 HOMEPAGE=https://wiki.github.com/camping/camping
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby20] >=dev-ruby/rack-1.0:*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mab-0.0.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0:*[ruby_targets_ruby21] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 )
 SLOT=0
 SRC_URI=mirror://rubygems/camping-2.1.532.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=538ad14eca14c95214c870d9db2eddb1
+_md5_=700251bd157bd371d8340e6abc348ac8
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.3.5 b/metadata/md5-cache/dev-ruby/capistrano-3.3.5
deleted file mode 100644
index 5b06315c2105..000000000000
--- a/metadata/md5-cache/dev-ruby/capistrano-3.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_ruby20] >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby20] >=dev-ruby/rake-10.0.0[ruby_targets_ruby20] dev-ruby/i18n:*[ruby_targets_ruby20] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_ruby21] >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] dev-ruby/i18n:*[ruby_targets_ruby21] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A distributed application deployment system
-EAPI=5
-HOMEPAGE=http://capistranorb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_ruby20] >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby20] >=dev-ruby/rake-10.0.0[ruby_targets_ruby20] dev-ruby/i18n:*[ruby_targets_ruby20] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/capistrano-stats-1.1.0:1[ruby_targets_ruby21] >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] dev-ruby/i18n:*[ruby_targets_ruby21] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=3
-SRC_URI=mirror://rubygems/capistrano-3.3.5.gem
-_eclass_exported_funcs=pkg_postinst:- pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=650e05870830a9bb48bb1aec8f58cfd5
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.4.0 b/metadata/md5-cache/dev-ruby/capistrano-3.4.0
deleted file mode 100644
index 25ea45a6987d..000000000000
--- a/metadata/md5-cache/dev-ruby/capistrano-3.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby20] >=dev-ruby/rake-10.0.0[ruby_targets_ruby20] dev-ruby/i18n:*[ruby_targets_ruby20] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] dev-ruby/i18n:*[ruby_targets_ruby21] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/mocha:0.12[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby21] ) ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
-DESCRIPTION=A distributed application deployment system
-EAPI=5
-HOMEPAGE=http://capistranorb.com/
-IUSE=test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby20] >=dev-ruby/rake-10.0.0[ruby_targets_ruby20] dev-ruby/i18n:*[ruby_targets_ruby20] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/sshkit-1.3:0[ruby_targets_ruby21] >=dev-ruby/rake-10.0.0[ruby_targets_ruby21] dev-ruby/i18n:*[ruby_targets_ruby21] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
-SLOT=3
-SRC_URI=mirror://rubygems/capistrano-3.4.0.gem
-_eclass_exported_funcs=pkg_postinst:- pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c259e12f0755cb2a58f47ea0386fadf3
diff --git a/metadata/md5-cache/dev-ruby/capybara-1.1.4 b/metadata/md5-cache/dev-ruby/capybara-1.1.4
index a82394cc5b98..7d81e6887e76 100644
--- a/metadata/md5-cache/dev-ruby/capybara-1.1.4
+++ b/metadata/md5-cache/dev-ruby/capybara-1.1.4
@@ -1,16 +1,16 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby20] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby20] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby21] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) test? ( ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) )
+DEPEND=test? ( ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
 DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
 EAPI=4
 HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 test
+IUSE=test test elibc_FreeBSD ruby_targets_ruby21 ruby_targets_ruby22 test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby20] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby20] >=dev-ruby/rack-1.0.0[ruby_targets_ruby20] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby20] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby20] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
-REQUIRED_USE=|| ( ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby21? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby21] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby21] >=dev-ruby/rack-1.0.0[ruby_targets_ruby21] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby21] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby21] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/mime-types-1.16[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] >=dev-ruby/xpath-0.1.4:0[ruby_targets_ruby22] ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby21 ruby_targets_ruby22 )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://rubygems/capybara-1.1.4.gem
 _eclass_exported_funcs=pkg_setup:ruby-ng src_unpack:ruby-ng src_prepare:ruby-ng src_configure:ruby-ng src_compile:ruby-ng src_test:ruby-ng src_install:ruby-ng
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	ruby-fakegem	e081b7d03e9e4ab4beba3ea9f44468d1	ruby-ng	2abd9e38aac141db06ae38bf32e748cd	ruby-utils	e9d0baddf239294b286da449ae7ac6a3	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=aa420781641c947c6db99743ebb7f0c4
+_md5_=66008fbb64a2a0edad9fb89aa144cc71
diff --git a/metadata/md5-cache/media-plugins/frei0r-plugins-1.5.0 b/metadata/md5-cache/media-plugins/frei0r-plugins-1.5.0
index 478bcbfface1..3295ccefb475 100644
--- a/metadata/md5-cache/media-plugins/frei0r-plugins-1.5.0
+++ b/metadata/md5-cache/media-plugins/frei0r-plugins-1.5.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0 ) scale0tilt? ( >=media-libs/gavl-1.2.0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 ) virtual/pkgconfig doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A minimalistic plugin API for video effects
 EAPI=6
 HOMEPAGE=http://www.dyne.org/software/frei0r/
 IUSE=doc +facedetect +scale0tilt
 KEYWORDS=amd64 hppa ppc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2
-RDEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0 ) scale0tilt? ( >=media-libs/gavl-1.2.0 )
+RDEPEND=x11-libs/cairo facedetect? ( >=media-libs/opencv-2.3.0:= ) scale0tilt? ( >=media-libs/gavl-1.2.0 )
 SLOT=0
 SRC_URI=http://files.dyne.org/frei0r/releases/frei0r-plugins-1.5.0.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=113a00381666b6a4636450e79dea4f65
+_md5_=cf6571e0c22ba2bd9fb8849eb80fff56
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.0.0 b/metadata/md5-cache/sci-libs/ViSP-3.0.0
deleted file mode 100644
index c0908d952702..000000000000
--- a/metadata/md5-cache/sci-libs/ViSP-3.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) virtual/pkgconfig test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
-EAPI=5
-HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
-IUSE=+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
-REQUIRED_USE=ffmpeg? ( opencv ) ois? ( ogre ) qt4? ( coin ) motif? ( coin )
-SLOT=0/3
-SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.0.0.tar.gz
-_eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
-_eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0277812c539dbc03f2873004dd948790
diff --git a/metadata/md5-cache/sci-libs/ViSP-3.0.1 b/metadata/md5-cache/sci-libs/ViSP-3.0.1
index 9c8059253769..13228f550553 100644
--- a/metadata/md5-cache/sci-libs/ViSP-3.0.1
+++ b/metadata/md5-cache/sci-libs/ViSP-3.0.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) virtual/pkgconfig test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) virtual/pkgconfig test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
 EAPI=5
 HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
 IUSE=+coin demos +dmtx doc examples ffmpeg gsl ieee1394 jpeg lapack motif ogre ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-2
-RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
+RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) ffmpeg? ( virtual/ffmpeg ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
 REQUIRED_USE=ffmpeg? ( opencv ) ois? ( ogre ) qt4? ( coin ) motif? ( coin )
 SLOT=0/3
 SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.0.1.tar.gz
 _eclass_exported_funcs=src_prepare:cmake-utils src_configure:- src_compile:- src_test:cmake-utils src_install:-
 _eclasses_=cmake-utils	a69f3a404abc4ade0a99e523f51b989d	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	f8073339d152f56626493f43d8ba4691	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	e7491451996e8b54c3caeb713285b0fb	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	0236be304ee52e7f179ed2f337075515	multiprocessing	284a473719153462f3e974d86c8cb81c	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=3ec0b8345714fad4f5b0257b1b919475
+_md5_=f30ce65729059b5577e8acf5073a7669
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 00deb7209e3b..42d74043776f 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5353,7 +5353,7 @@ dev-ml/ppx_jane 0.9.0: Standard Jane Street ppx rewriters
 dev-ml/ppx_js_style 0.9.0: Code style checker for Jane Street Packages
 dev-ml/ppx_let 0.9.0: Monadic let-bindings
 dev-ml/ppx_metaquot 0.9.0: Write OCaml AST fragment using OCaml syntax
-dev-ml/ppx_optcomp 0.9.0: Optional compilation for OCaml
+dev-ml/ppx_optcomp 0.9.0-r1: Optional compilation for OCaml
 dev-ml/ppx_optional 0.9.0: Pattern matching on flat options
 dev-ml/ppx_pipebang 0.9.0: A ppx rewriter that inlines reverse application operators |> and |!
 dev-ml/ppx_sexp_conv 0.9.0-r1: Support Library for type-driven code generators
@@ -8964,7 +8964,7 @@ dev-ros/collada_urdf 1.12.6 1.12.7 1.12.8 9999: Tool to convert Unified Robot De
 dev-ros/combined_robot_hw 0.11.0 0.11.1 0.11.2 0.11.3 0.11.4 9999: Combined Robot HW class
 dev-ros/combined_robot_hw_tests 0.11.0 0.11.1 0.11.2 0.11.3 0.11.4 9999: Combined Robot HW class tests
 dev-ros/compressed_depth_image_transport 1.9.2-r1 1.9.3 1.9.5 9999: Plugin to image_transport for transparently sending depth images using PNG compression
-dev-ros/compressed_image_transport 1.9.2-r1 1.9.3 1.9.5 9999: Plugin to image_transport for transparently sending images encoded as JPEG or PNG
+dev-ros/compressed_image_transport 1.9.5 9999: Plugin to image_transport for transparently sending images encoded as JPEG or PNG
 dev-ros/control_msgs 1.3.1 1.4.0 9999: Base messages and actions useful for controlling robots
 dev-ros/control_toolbox 1.14.0 1.15.0 9999: Modules that are useful across all controllers
 dev-ros/controller_interface 0.9.3 0.10.0 0.10.1 0.11.0 0.11.1 0.11.2 0.11.3 0.11.4 9999: Interface base class for controllers
@@ -8974,7 +8974,7 @@ dev-ros/controller_manager_tests 0.9.3 0.10.0 0.10.1 0.11.0 0.11.1 0.11.2 0.11.3
 dev-ros/convex_decomposition 0.1.10 0.1.11 9999: Convex Decomposition Tool for Robot Model
 dev-ros/costmap_2d 1.14.0-r1 9999: Creates a 2D costmap from sensor data
 dev-ros/cpp_common 0.5.6 0.5.7 0.6.0 0.6.1 0.6.2 9999: C++ code for doing things that are not necessarily ROS related
-dev-ros/cv_bridge 1.12.4 9999: Converts between ROS Image messages and OpenCV images
+dev-ros/cv_bridge 1.12.4-r1 9999: Converts between ROS Image messages and OpenCV images
 dev-ros/depth_image_proc 1.12.19 9999: Nodelets for processing depth images such as those produced by OpenNI camera
 dev-ros/depthimage_to_laserscan 1.0.7-r1 9999: Converts a depth image to a laser scan for use with navigation and localization
 dev-ros/diagnostic_aggregator 1.8.9 1.8.10 9999: Aggregates ROS diagnostics
@@ -9278,7 +9278,7 @@ dev-ruby/afm 0.2.2: A very simple library to read Adobe Font Metrics files
 dev-ruby/akismet 1.0.2 2.0.0: A Ruby client for the Akismet API
 dev-ruby/allison 2.0.3-r3: A modern, pretty RDoc template
 dev-ruby/amatch 0.3.0: Approximate Matching Extension for Ruby
-dev-ruby/ammeter 1.1.3 1.1.3-r1 1.1.4 1.1.4-r1: Write specs for your Rails 3+ generators
+dev-ruby/ammeter 1.1.4 1.1.4-r1: Write specs for your Rails 3+ generators
 dev-ruby/amq-client 1.0.4: A fully-featured, low-level AMQP 0.9.1 client
 dev-ruby/amq-protocol 1.9.2 2.0.1 2.0.1-r1 2.1.0: An AMQP 0.9.1 serialization library for Ruby
 dev-ruby/amqp 1.6.0 1.7.0: AMQP client implementation in Ruby/EventMachine
@@ -9294,7 +9294,7 @@ dev-ruby/asciimath 1.0.2 1.0.4: A pure Ruby AsciiMath parsing and conversion lib
 dev-ruby/ast 2.2.0 2.3.0: A library for working with abstract syntax trees
 dev-ruby/astrolabe 1.3.1: An object-oriented AST extension for Parser
 dev-ruby/async_sinatra 1.2.1: Asynchronous response API for Sinatra and Thin
-dev-ruby/atomic 1.1.16 1.1.99: An atomic reference implementation for JRuby, Rubinius, and MRI
+dev-ruby/atomic 1.1.99: An atomic reference implementation for JRuby, Rubinius, and MRI
 dev-ruby/autoprefixer-rails 6.7.3 6.7.7 6.7.7.1: Add vendor prefixes to CSS rules using values from the Can I Use website
 dev-ruby/awesome_print 1.7.0: Library to pretty print Ruby objects in full color with proper indentation
 dev-ruby/aws-s3 0.6.3: Client library for Amazon's Simple Storage Service's REST API
@@ -9328,7 +9328,7 @@ dev-ruby/bundler-audit 0.4.0 0.5.0: Provides patch-level verification for Bundle
 dev-ruby/bunny 2.6.3 2.6.4-r1 2.6.5: Another synchronous Ruby AMQP client
 dev-ruby/calendar_date_select 2.1.2: A popular and flexible JavaScript DatePicker for RubyOnRails
 dev-ruby/camping 2.1.532: A small web framework modeled after Ruby on Rails
-dev-ruby/capistrano 2.15.5-r2 3.3.5 3.4.0 3.4.1: A distributed application deployment system
+dev-ruby/capistrano 2.15.5-r2 3.4.1: A distributed application deployment system
 dev-ruby/capistrano-stats 1.1.1: Official metrics to help the development direction of Capistrano
 dev-ruby/capybara 1.1.4 2.10.1 2.12.0 2.12.1 2.13.0: Capybara aims to simplify the process of integration testing Rack applications
 dev-ruby/celluloid 0.16.0-r1 0.17.3: Provides a simple and natural way to build fault-tolerant concurrent programs
@@ -16290,7 +16290,7 @@ sci-geosciences/xtide 2.13 2.13.1 2.13.2: XTide provides tide and current predic
 sci-libs/Fiona 1.5.1 9999: OGR's neat, nimble, no-nonsense API
 sci-libs/Rtree 0.8.2: R-Tree spatial index for Python GIS
 sci-libs/Shapely 1.3.0 1.3.2 1.5.17 1.5.17-r1 9999: Geometric objects, predicates, and operations
-sci-libs/ViSP 3.0.0 3.0.1: Visual Servoing Platform: visual tracking and visual servoing library
+sci-libs/ViSP 3.0.1: Visual Servoing Platform: visual tracking and visual servoing library
 sci-libs/adolc 2.4.1 2.5.0 2.5.2 2.6.2: Automatic differentiation system for C/C++
 sci-libs/alglib 3.8.2-r1 3.10.0-r1: Numerical analysis and data processing library
 sci-libs/amd 2.3.1: Library to order a sparse matrix prior to Cholesky factorization
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index eed36b3601d0..32c463bea574 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 17 Apr 2017 09:02:27 +0000
+Mon, 17 Apr 2017 09:42:25 +0000